Update test suite to timeout after 300 seconds, show error_log on failure in Github...

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b0e13bd5cd93726683bbaae9c99ea223c8ca26a1..6c7e4705d2a86566141b3281e9883c01cfad097b 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,13 +18,11 @@ jobs:
     - name: configure
       env:
         CC: /usr/bin/gcc
-      run: ./configure --enable-debug --enable-maintainer --enable-sanitizer
+      run: ./configure --enable-debug --enable-maintainer
     - name: make
       run: make
     - name: test
-      env:
-        ASAN_OPTIONS: leak_check_at_exit=false
-      run: make test
+      run: make test || cat test/error_log*
 
   build-macos:
 
@@ -37,4 +35,4 @@ jobs:
     - name: make
       run: make
     - name: test
-      run: make test
+      run: make test || cat test/error_log*

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 4498a8c1038f55f433bb8d4a7c50ab01f210f801..8efc6c1437a4713d9c0f9b7c205727c3dbe82df6 100755 (executable)
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -3,7 +3,7 @@
 # Perform the complete set of IPP compliance tests specified in the
 # CUPS Software Test Plan.
 #
-# Copyright © 2020 by Michael R Sweet
+# Copyright © 2020-2021 by Michael R Sweet
 # Copyright © 2007-2019 by Apple Inc.
 # Copyright © 1997-2007 by Easy Software Products, all rights reserved.
 #
@@ -700,7 +700,8 @@ else
        sleep 2
 fi
 
-while true; do
+tries=0
+while test $tries -lt 30; do
        running=`$runcups ../systemv/lpstat -r 2>/dev/null`
        if test "x$running" = "xscheduler is running"; then
                break
@@ -708,6 +709,8 @@ while true; do
 
        echo "Waiting for scheduler to become ready..."
        sleep 10
+
+       tries=`expr $tries + 1`
 done
 
 #