From 4bcb63dc17a395e34f7e89d6764e7945c9d14549 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Mon, 29 Aug 2011 15:27:08 +0200 Subject: [PATCH] tests: some minor fixlets w.r.t. TAP-based tests The variable that is used by our test scripts to decide whether they are "plain" or TAP-based is `using_tap'; however, some peripheral sanity checks and sanitization code in our testsuite were erroneously using the `use_tap' variable instead. Fix that. * tests/Makefile.am (AM_TESTS_ENVIRONMENT): Nullify `using_tap', not `use_tap'. * tests/defs-static.in: Check that `using_tap', not `use_tap', is not exported. * tests/self-check-env-sanitize.test: Update. --- ChangeLog | 13 +++++++++++++ tests/Makefile.am | 2 +- tests/Makefile.in | 2 +- tests/defs-static.in | 2 +- tests/self-check-env-sanitize.test | 2 +- 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a48d4d2..460c213 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,18 @@ 2011-08-29 Stefano Lattarini + tests: some minor fixlets w.r.t. TAP-based tests + The variable that is used by our test scripts to decide whether + they are "plain" or TAP-based is `using_tap'; however, some + peripheral sanity checks and sanitization code in our testsuite + were erroneously using the `use_tap' variable instead. Fix that. + * tests/Makefile.am (AM_TESTS_ENVIRONMENT): Nullify `using_tap', + not `use_tap'. + * tests/defs-static.in: Check that `using_tap', not `use_tap', + is not exported. + * tests/self-check-env-sanitize.test: Update. + +2011-08-29 Stefano Lattarini + tests: avoid re-running a test with the 'parallel-tests' option * tests/backcompat5.test (parallel_tests): Define to "no", to prevent the generation of a sibling test script that uses the diff --git a/tests/Makefile.am b/tests/Makefile.am index 8e73e5c..0414e4f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -107,7 +107,7 @@ XFAIL_TESTS += $(instspc_xfail_tests) AM_TESTS_ENVIRONMENT = \ test x"$$me" = x || unset me; \ test x"$$required" = x || unset required; \ - test x"$$use_tap" = x || unset use_tap; \ + test x"$$using_tap" = x || unset using_tap; \ test x"$$parallel_tests" = x || unset parallel_tests; \ test x"$$original_AUTOMAKE" = x || unset original_AUTOMAKE; \ test x"$$original_ACLOCAL" = x || unset original_ACLOCAL; diff --git a/tests/Makefile.in b/tests/Makefile.in index aec6d77..cec28b9 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -366,7 +366,7 @@ instspc_xfail_tests = instspc-squote-build.test \ AM_TESTS_ENVIRONMENT = \ test x"$$me" = x || unset me; \ test x"$$required" = x || unset required; \ - test x"$$use_tap" = x || unset use_tap; \ + test x"$$using_tap" = x || unset using_tap; \ test x"$$parallel_tests" = x || unset parallel_tests; \ test x"$$original_AUTOMAKE" = x || unset original_AUTOMAKE; \ test x"$$original_ACLOCAL" = x || unset original_ACLOCAL; diff --git a/tests/defs-static.in b/tests/defs-static.in index f1294c6..de9bd66 100644 --- a/tests/defs-static.in +++ b/tests/defs-static.in @@ -66,7 +66,7 @@ fi # Check that the environment is properly sanitized. # Having variables exported to the empty string is OK, since our code # treats such variables as if they were unset. -for var in me required use_tap parallel_tests \ +for var in me required using_tap parallel_tests \ original_AUTOMAKE original_ACLOCAL; do if eval "test x\"\$$var\" != x" && env | grep "^$var=" >/dev/null; then diff --git a/tests/self-check-env-sanitize.test b/tests/self-check-env-sanitize.test index 1f7dba2..1dac020 100755 --- a/tests/self-check-env-sanitize.test +++ b/tests/self-check-env-sanitize.test @@ -27,7 +27,7 @@ vars=' me parallel_tests required - use_tap + using_tap original_AUTOMAKE original_ACLOCAL ' -- 2.7.4