From 71f982809b4c5ad0efacd31a26082d0cc66ca2c9 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Tue, 2 Feb 2021 09:40:39 -0500 Subject: [PATCH] Update test suite to timeout after 300 seconds, show error_log on failure in Github action. --- .github/workflows/build.yml | 8 +++----- test/run-stp-tests.sh | 7 +++++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b0e13bd5cd..6c7e4705d2 100644 --- 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 4498a8c103..8efc6c1437 100755 --- 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 # -- 2.47.2