From: Tomi Ollila Date: Wed, 28 Nov 2012 07:25:07 +0000 (+0200) Subject: Re: [PATCH] test: Abort driver if a test script aborts X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f6291ccde1f4821f7ce8aa8fcda083ac7c167c96;p=notmuch-archives.git Re: [PATCH] test: Abort driver if a test script aborts --- diff --git a/28/159b614abad2c248f226bbeee1a943db97d284 b/28/159b614abad2c248f226bbeee1a943db97d284 new file mode 100644 index 000000000..0a83e6129 --- /dev/null +++ b/28/159b614abad2c248f226bbeee1a943db97d284 @@ -0,0 +1,129 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 1F7C6431FAF + for ; Tue, 27 Nov 2012 23:25:12 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id q6qaPtFzYEre for ; + Tue, 27 Nov 2012 23:25:11 -0800 (PST) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 0EE59431FAE + for ; Tue, 27 Nov 2012 23:25:11 -0800 (PST) +Received: from guru.guru-group.fi (localhost [IPv6:::1]) + by guru.guru-group.fi (Postfix) with ESMTP id 4FFC31000E5; + Wed, 28 Nov 2012 09:25:07 +0200 (EET) +From: Tomi Ollila +To: Austin Clements , notmuch@notmuchmail.org +Subject: Re: [PATCH] test: Abort driver if a test script aborts +In-Reply-To: <1354075997-29140-1-git-send-email-amdragon@mit.edu> +References: <1354075997-29140-1-git-send-email-amdragon@mit.edu> +User-Agent: Notmuch/0.14+116~g29fcdb5 (http://notmuchmail.org) Emacs/24.2.1 + (x86_64-unknown-linux-gnu) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Wed, 28 Nov 2012 07:25:12 -0000 + +On Wed, Nov 28 2012, Austin Clements wrote: + +> Previously, if a test script aborted (e.g., because it passed too few +> arguments to a test function), the test driver loop would simply +> continue on to the next test script and the final results would +> declare that everything passed (except that the test count would look +> suspiciously low, but maybe you just misremembered how many tests +> there were). +> +> Now, if a test script exits with a non-zero status and did not produce +> a final results file, we propagate that failure out of the driver loop +> immediately. +> +> To keep this simple, this patch removes the PID from the test-results +> file name. This PID was inherited from the git test system and seems +> unnecessary, since the file name already includes the name of the test +> script and the test-results directory is created anew for each run. +> --- + ++1 + +Tomi + + +> test/basic | 2 +- +> test/notmuch-test | 6 ++++++ +> test/test-lib.sh | 2 +- +> 3 files changed, 8 insertions(+), 2 deletions(-) +> +> diff --git a/test/basic b/test/basic +> index 1b842d2..b7feb07 100755 +> --- a/test/basic +> +++ b/test/basic +> @@ -79,7 +79,7 @@ test_begin_subtest "Ensure that -v does not suppress test output" +> output=$(cd $TEST_DIRECTORY; ./test-verbose -v 2>&1 | suppress_diff_date) +> expected=$(cat $EXPECTED/test-verbose-yes | suppress_diff_date) +> # Do not include the results of test-verbose in totals +> -rm $TEST_DIRECTORY/test-results/test-verbose-* +> +rm $TEST_DIRECTORY/test-results/test-verbose +> rm -r $TEST_DIRECTORY/tmp.test-verbose +> test_expect_equal "$output" "$expected" +> +> diff --git a/test/notmuch-test b/test/notmuch-test +> index 9a1b375..f275439 100755 +> --- a/test/notmuch-test +> +++ b/test/notmuch-test +> @@ -81,6 +81,12 @@ trap 'e=$?; kill $!; exit $e' HUP INT TERM +> for test in $TESTS; do +> $TEST_TIMEOUT_CMD ./$test "$@" & +> wait $! +> + # If the test failed without producing results, then it aborted, +> + # so we should abort, too. +> + RES=$? +> + if [[ $RES != 0 && ! -e "test-results/${test%.sh}" ]]; then +> + exit $RES +> + fi +> done +> trap - HUP INT TERM +> +> diff --git a/test/test-lib.sh b/test/test-lib.sh +> index e092231..77063a4 100644 +> --- a/test/test-lib.sh +> +++ b/test/test-lib.sh +> @@ -920,7 +920,7 @@ test_done () { +> GIT_EXIT_OK=t +> test_results_dir="$TEST_DIRECTORY/test-results" +> mkdir -p "$test_results_dir" +> - test_results_path="$test_results_dir/${0%.sh}-$$" +> + test_results_path="$test_results_dir/${0%.sh}" +> +> echo "total $test_count" >> $test_results_path +> echo "success $test_success" >> $test_results_path +> -- +> 1.7.10.4 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch