testsuite: Disable flaky T2 spectests and update helper script

Author: rdmark

test/testsuite/T2_FPDelete.c

@@ -292,6 +292,8 @@ DSI *dsi = &Conn->dsi;
 /* ----------- */
 void FPDelete_test()
 {
+// FIXME: all flaky with Netatalk 4.0; mix of fails and false passes
+#if 0
     fprintf(stdout,"===================\n");
     fprintf(stdout,"FPDelete page 143\n");
     test146();
@@ -300,5 +302,6 @@ void FPDelete_test()
     test363();
 #endif
     test364();
+#endif
 }
 

test/testsuite/T2_FPOpenFork.c

@@ -1542,5 +1542,10 @@ void FPOpenFork_test()
     test236();
     test237();
     test238();
+// FIXME: test seems to require manually moving data file to
+// data/resource_fork_conversion_test
+// Disabling for now.
+#if 0
     test431();
+#endif
 }

test/testsuite/T2_FPSetFileParms.c

@@ -220,6 +220,9 @@ void FPSetFileParms_test()
     fprintf(stdout,"FPSetFileParms page 262\n");
     test89();
     test120();
+// FIXME: test stalls indefinitely
+#if 0
     test426();
+#endif
 }
 

test/testsuite/meson.build

@@ -223,7 +223,8 @@ T2_spectest = executable(
 spectest_sh = find_program('spectest.sh')
 
 test(
-    'spectest',
+    'AFP specification test suite',
     spectest_sh,
     is_parallel: true,
+    timeout: 90,
 )

test/testsuite/spectest.sh

@@ -14,8 +14,8 @@ check_return() {
 
 echo =====================================
 
-if [ ! -f spectest.conf ] ; then
-    cat > spectest.conf <<EOF
+if [ ! -f ./test/testsuite/spectest.conf ] ; then
+    cat > ./test/testsuite/spectest.conf <<EOF
 # AFPSERVER=127.0.0.1
 # AFPPORT=548
 # USER1=
@@ -36,7 +36,7 @@ EOF
     exit 0
 fi
 
-. ./spectest.conf
+. ./test/testsuite/spectest.conf
 
 # cleanup
 if test ! -z "$LOCALVOL1PATH" ; then
@@ -52,28 +52,28 @@ rm -f spectest.log
 
 ##
 printf "Running spectest with two users..."
-./spectest -"$AFPVERSION" -h "$AFPSERVER" -p "$AFPPORT" -u "$USER1" -d "$USER2" -w "$PASSWD" -s "$VOLUME1"  -S "$VOLUME2" >> spectest.log 2>&1
+./test/testsuite/spectest -"$AFPVERSION" -h "$AFPSERVER" -p "$AFPPORT" -u "$USER1" -d "$USER2" -w "$PASSWD" -s "$VOLUME1"  -S "$VOLUME2" >> ./test/testsuite/spectest.log 2>&1
 check_return
 
 ##
 printf "Running spectest with local filesystem modifications..."
-./T2_spectest -"$AFPVERSION" -h "$AFPSERVER" -p "$AFPPORT" -u "$USER1" -d "$USER2" -w "$PASSWD" -s "$VOLUME1" -S "$VOLUME2" -c "$LOCALVOL1PATH" >> spectest.log 2>&1
+./test/testsuite/T2_spectest -"$AFPVERSION" -h "$AFPSERVER" -p "$AFPPORT" -u "$USER1" -d "$USER2" -w "$PASSWD" -s "$VOLUME1" -S "$VOLUME2" -c "$LOCALVOL1PATH" >> ./test/testsuite/spectest.log 2>&1
 check_return
 
 echo =====================================
 echo Failed tests
-echo ––––––––––––
-grep "summary.*FAIL" spectest.log | sed s/test//g | sort -n | uniq
+echo ------------
+grep "summary.*FAIL" ./test/testsuite/spectest.log | sed s/test//g | sort -n | uniq
 echo =====================================
 
 echo Skipped tests
-echo –––––––––––––
-egrep 'summary.*NOT TESTED|summary.*SKIPPED' spectest.log | sed s/test//g | sort -n | uniq
+echo -------------
+egrep 'summary.*NOT TESTED|summary.*SKIPPED' ./test/testsuite/spectest.log | sed s/test//g | sort -n | uniq
 echo =====================================
 
-echo Successfull tests
-echo –––––––––––––––––
-grep "summary.*PASSED" spectest.log | sed s/test//g | sort -n | uniq
+echo Successful tests
+echo ----------------
+grep "summary.*PASSED" ./test/testsuite/spectest.log | sed s/test//g | sort -n | uniq
 echo =====================================
 
 # cleanup