From 892e6f7ea61e39d8504e3f227ee3ae874521f05c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Sun, 3 Oct 2010 13:59:59 -0600 Subject: test-lib: make test_expect_code a test command MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change test_expect_code to be a normal test command instead of a top-level command. As a top-level command it would fail in cases like: test_expect_code 1 'phoney' ' foo && bar && (exit 1) ' Here the test might incorrectly succeed if "foo" or "bar" happened to fail with exit status 1. Instead we now do: test_expect_success 'phoney' ' foo && bar && test_expect_code 1 "(exit 1)" ' Which will only succeed if "foo" and "bar" return status 0, and "(exit 1)" returns status 1. Note that test_expect_code has been made slightly noisier, as it reports the exit code it receives even upon success. Some test code in t0000-basic.sh relied on the old semantics of test_expect_code to test the test_when_finished command. I've converted that code to use an external test similar to the TODO test I added in v1.7.3-rc0~2^2~3. Signed-off-by: Ævar Arnfjörð Bjarmason Acked-by: Jonathan Nieder Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- t/README | 16 +++++++------- t/t0000-basic.sh | 55 ++++++++++++++++++++++++++++++++++++++++--------- t/t1504-ceiling-dirs.sh | 5 +++-- t/t6020-merge-df.sh | 4 +++- t/test-lib.sh | 40 +++++++++++++++++++---------------- 5 files changed, 82 insertions(+), 38 deletions(-) (limited to 't') diff --git a/t/README b/t/README index a1eb7c8720..ee4c0cf685 100644 --- a/t/README +++ b/t/README @@ -395,13 +395,6 @@ library for your script to use. Like test_expect_success this function can optionally use a three argument invocation with a prerequisite as the first argument. - - test_expect_code []