diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-12-28 13:23:31 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-05-07 21:38:47 +0200 |
| commit | 21d1b9342743efdb196110093b3b6ee156688b83 (patch) | |
| tree | 7aecfeadd08508428dbfa5729e5a6b5fb48b3ea3 /t/self-check-explicit-skips.sh | |
| parent | dda822736d5e66f5b8fa6888397894c09a5fdcaa (diff) | |
| download | automake-21d1b9342743efdb196110093b3b6ee156688b83.tar.gz | |
tests: shell running test scripts is now named AM_TEST_RUNNER_SHELL
This is just a preparatory refactoring for future changes.
* configure.ac (AM_TEST_RUNNER_SHELL): New variable, defined
to $SHELL', and AC_SUBST'd.
* Makefile.am (LOG_COMPILER): Redefine from $(SHELL) to
$(AM_TEST_RUNNER_SHELL).
* defs: Adjust to use $AM_TEST_RUNNER_SHELL instead
of $CONFIG_SHELL and/or $SHELL, where appropriate. Minor
opportunistic changes.
* t/self-check-explicit-skips.sh: Likewise.
* t/self-check-sanity.sh: Likewise.
* t/self-check-tap.sh: Likewise.
* t/self-check-cleanup.tap: Likewise.
* t/self-check-dir.tap: Likewise.
* t/self-check-env-sanitize.tap: Likewise.
* t/self-check-exit.tap: Likewise.
* t/self-check-me.tap: Likewise.
* t/self-check-reexec.tap: Likewise.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/self-check-explicit-skips.sh')
| -rwxr-xr-x | t/self-check-explicit-skips.sh | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/t/self-check-explicit-skips.sh b/t/self-check-explicit-skips.sh index 3e7a77c0a..2b64fe156 100755 --- a/t/self-check-explicit-skips.sh +++ b/t/self-check-explicit-skips.sh @@ -35,22 +35,25 @@ set +e unset am_explicit_skips stderr_fileno_ AM_TESTS_REEXEC=no; export AM_TESTS_REEXEC -$SHELL -c '. ./defs; (exit 77); exit 77' dummy.test +# I'm a lazy typist. +sh=$AM_TEST_RUNNER_SHELL + +$sh -c '. ./defs; (exit 77); exit 77' dummy.test test $? -eq 77 || Exit 1 -am_explicit_skips=no $SHELL -c '. ./defs; sh -c "exit 77"' dummy.test +am_explicit_skips=no $sh -c '. ./defs; sh -c "exit 77"' dummy.test test $? -eq 77 || Exit 1 -am_explicit_skips=yes $SHELL -c '. ./defs; (exit 77); exit 77' dummy.test +am_explicit_skips=yes $sh -c '. ./defs; (exit 77); exit 77' dummy.test test $? -eq 78 || Exit 1 -am_explicit_skips=y $SHELL -c '. ./defs; sh -c "exit 77"' dummy.test +am_explicit_skips=y $sh -c '. ./defs; sh -c "exit 77"' dummy.test test $? -eq 78 || Exit 1 -am_explicit_skips=yes $SHELL -c '. ./defs; Exit 77' dummy.test +am_explicit_skips=yes $sh -c '. ./defs; Exit 77' dummy.test test $? -eq 77 || Exit 1 -am_explicit_skips=y $SHELL -c '. ./defs; skip_ "foo"' dummy.test +am_explicit_skips=y $sh -c '. ./defs; skip_ "foo"' dummy.test test $? -eq 77 || Exit 1 : |