testsuite: Remove the now-unused Exclude option

Netatalk · Oct 31, 2024 · 2022697 · 2022697
1 parent cc672a8
commit 2022697
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 8 deletions.
diff --git a/doc/ja/manpages/man1/afptest.1.xml b/doc/ja/manpages/man1/afptest.1.xml
@@ -78,7 +78,7 @@
           <primary>afptest</primary>
         </indexterm></command>
 
-      <arg>-1234567aCiLlmnVvx</arg>
+      <arg>-1234567aCiLlmVv</arg>
 
       <arg>-h <replaceable>ホスト</replaceable></arg>
 

diff --git a/doc/manpages/man1/afptest.1.xml b/doc/manpages/man1/afptest.1.xml
@@ -78,7 +78,7 @@
           <primary>afptest</primary>
         </indexterm></command>
 
-      <arg>-1234567aCiLlmnVvx</arg>
+      <arg>-1234567aCiLlmVv</arg>
 
       <arg>-h <replaceable>host</replaceable></arg>
 

diff --git a/test/testsuite/afpcli.c b/test/testsuite/afpcli.c
@@ -2,13 +2,15 @@
 #include "test.h"
 
 // Define the global test settings
-int     Throttle = 0;
-int     Convert = 1;
+int Throttle = 0;
+int Convert = 1;
 int	Interactive = 0;
 int	Quiet = 1;
 int	Verbose = 0;
 int	Color = 1;
+#if 0
 int	Exclude = 0;
+#endif
 
 #define UNICODE(a) (a->afp_version >= 30)
 

diff --git a/test/testsuite/afphelper.c b/test/testsuite/afphelper.c
@@ -882,9 +882,11 @@ void test_skipped(int why)
 	case T_VOL_BIG:
 		s = "a smaller volume";
 		break;
+#if 0
 	case T_EXCLUDE:
 		s = "in the Exclude bucket";
 		break;
+#endif
 	case T_MANUAL:
 		s = "Interactive mode";
 		break;

diff --git a/test/testsuite/specs.h b/test/testsuite/specs.h
@@ -105,7 +105,9 @@ extern int not_valid_bitmap(unsigned int ret, unsigned int bitmap, int afpd_erro
 #define T_NO_UNIX_PREV 21
 #define T_SINGLE     22
 #define T_VOL_BIG    23
+#if 0
 #define T_EXCLUDE    24
+#endif
 #define T_MANUAL     25
 #define T_AFP31      26
 #define T_AFP32      27

diff --git a/test/testsuite/spectest.c b/test/testsuite/spectest.c
@@ -349,8 +349,9 @@ void usage( char * av0 )
     fprintf( stdout,"\t-7\tAFP 3.4 version (default)\n");
     fprintf( stdout,"\t-v\tverbose\n");
     fprintf( stdout,"\t-V\tvery verbose\n");
-
+#if 0
     fprintf( stdout,"\t-x\tdon't run tests with known bugs\n");
+#endif
     fprintf( stdout,"\t-f\ttest or testset to run\n");
     fprintf( stdout,"\t-l\tlist testsets\n");
     fprintf( stdout,"\t-i\tinteractive mode, prompts before every test (debug purposes)\n");
@@ -363,7 +364,7 @@ int main( int ac, char **av )
 int cc;
 int ret;
 
-    while (( cc = getopt( ac, av, "vV1234567ah:H:p:s:S:u:d:w:c:f:LlmxiC" )) != EOF ) {
+    while (( cc = getopt( ac, av, "1234567aCiLlmVvc:d:f:H:h:p:S:s:u:w:" )) != EOF ) {
         switch ( cc ) {
         case '1':
 			vers = "AFPVersion 2.1";
@@ -454,9 +455,11 @@ int ret;
         case 'w':
             Password = strdup(optarg);
             break;
+#if 0
         case 'x':
         	Exclude = 1;
         	break;
+#endif
 
         default :
             usage( av[ 0 ] );

diff --git a/test/testsuite/test.h b/test/testsuite/test.h
@@ -123,8 +123,6 @@ const char *AfpNum2name(int num);
 
 extern CONN *Conn, *Conn2;
 
-// extern DSI *dsi;
-// extern uint16_t vol;
 extern char Data[];
 
 extern char *Vol;
@@ -141,7 +139,9 @@ extern int Loglevel;
 extern int Color;
 extern int Interactive;
 extern int Throttle;
+#if 0
 extern int Exclude;
+#endif
 
 extern int PassCount;
 extern int FailCount;