diff options
| author |  Tomi Ollila <tomi.ollila@iki.fi> | 2013-11-25 19:08:17 +0200 |
|---|---|---|
| committer |  David Bremner <david@tethera.net> | 2013-12-09 23:25:28 +0800 |
| commit | 5985438e057b51404208458fceadd03aae13eb80 (patch) | |
| tree | 03d6aa8e879959e079ed57a85488fe5ba8bd7404 /test | |
| parent | bb390f89a1599f4767fbf7fc7cb1f01aba22b9ae (diff) | |
test: resolve `basename "$0" .sh` once for all in test-lib.sh
test-lib.sh sometimes did equivalent of `basename "$0" .sh`, sometimes
skipping the basename part and sometimes .sh part. This worked as
we never had path components in $0 (more than ./) nor .sh ending.
Now the equivalent of `basename "$0" .sh` is done once and used
everywhere. In the future we may have .sh suffix in test names
-- removing those is a good idea.
Diffstat (limited to 'test')
| -rw-r--r-- | test/test-lib.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/test/test-lib.sh b/test/test-lib.sh index 8611ba5e..6e475452 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -25,6 +25,9 @@ fi # Make sure echo builtin does not expand backslash-escape sequences by default. shopt -u xpg_echo +this_test=${0##*/} +this_test=${this_test%.sh} + # if --tee was passed, write the output not only to the terminal, but # additionally to the file test-results/$BASENAME.out, too. case "$GIT_TEST_TEE_STARTED, $* " in @@ -33,7 +36,7 @@ done,*) ;; *' --tee '*|*' --va'*) mkdir -p test-results - BASE=test-results/$(basename "$0" .sh) + BASE=test-results/$this_test (GIT_TEST_TEE_STARTED=done ${SHELL-sh} "$0" "$@" 2>&1; echo $? > $BASE.exit) | tee $BASE.out test "$(cat $BASE.exit)" = 0 @@ -187,7 +190,7 @@ then exit 0 fi -echo $(basename "$0"): "Testing ${test_description}" +echo $this_test: "Testing ${test_description}" exec 5>&1 @@ -967,7 +970,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/$this_test" echo "total $test_count" >> $test_results_path echo "success $test_success" >> $test_results_path @@ -1026,7 +1029,7 @@ test_emacs () { test -z "$missing_dependencies" || return if [ -z "$EMACS_SERVER" ]; then - emacs_tests="$(basename $0).el" + emacs_tests="${this_test}.el" if [ -f "$TEST_DIRECTORY/$emacs_tests" ]; then load_emacs_tests="--eval '(load \"$emacs_tests\")'" else @@ -1140,7 +1143,6 @@ else exec 4>test.output 3>&4 fi -this_test=${0##*/} for skp in $NOTMUCH_SKIP_TESTS do to_skip= |