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-dir.tap | |
| 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-dir.tap')
| -rwxr-xr-x | t/self-check-dir.tap | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/t/self-check-dir.tap b/t/self-check-dir.tap index 736238c35..424367eac 100755 --- a/t/self-check-dir.tap +++ b/t/self-check-dir.tap @@ -27,16 +27,17 @@ plan_ 5 AM_TESTS_REEXEC=no; export AM_TESTS_REEXEC keep_testdirs=; unset keep_testdirs -# This needs to be consistent with what $SHELL deems to be the -# current working directory. -cwd=`$SHELL -c 'pwd'` || fatal_ "can't get current working directory" +# This needs to be consistent with what $AM_TEST_RUNNER_SHELL +# deems to be the current working directory. +cwd=`$AM_TEST_RUNNER_SHELL -c 'pwd'` \ + || fatal_ "can't get current working directory" echo "$cwd" do_check () { test ! -d _self.dir || rm -rf _self.dir \ || framework_failure_ "cleaning up _self.dir" - command_ok_ "$1 [$2]" $SHELL -c " + command_ok_ "$1 [$2]" $AM_TEST_RUNNER_SHELL -c " $2 . ./defs || Exit 99 # Don't fail if 'ls -l' fails; avoids possible racy spurious failures. |