[PATCH v2] test: leave T\d\d\d- in variable $this_test and introduce $this_test_bare

[Tomi Ollila]

Script `notmuch-test` expects the results file have T\d\d\d- part
intact so the results files (and some test output files) are now
name as such.
Without this change `notmuch-test` will exit in case the test
script it was executing exited with nonzero value.

The T\d\d\d- part is dropped in new variable $this_test_bare which is
used in progress informational messages and when loading .el files in
emacs tests (whenever $this_test_bare.el exists).
---

This is v2 of id:1389645491-7600-1-git-send-email-tomi.ollila at iki.fi

Ignore id:1389812307-17065-1-git-send-email-tomi.ollila at iki.fi ,
i sent wrong patch file :/.

 test/test-lib.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 487075e..78af170 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -27,7 +27,7 @@ shopt -u xpg_echo
 
 this_test=${0##*/}
 this_test=${this_test%.sh}
-this_test=${this_test#T[0-9][0-9][0-9]-}
+this_test_bare=${this_test#T[0-9][0-9][0-9]-}
 
 # if --tee was passed, write the output not only to the terminal, but
 # additionally to the file test-results/$BASENAME.out, too.
@@ -196,7 +196,7 @@ print_test_description ()
 {
 	test -z "$test_description_printed" || return 0
 	echo
-	echo $this_test: "Testing ${test_description}"
+	echo $this_test_bare: "Testing ${test_description}"
 	test_description_printed=1
 }
 if [ -z "$NOTMUCH_TEST_QUIET" ]
@@ -1085,7 +1085,7 @@ test_emacs () {
 	test -z "$missing_dependencies" || return
 
 	if [ -z "$EMACS_SERVER" ]; then
-		emacs_tests="${this_test}.el"
+		emacs_tests="${this_test_bare}.el"
 		if [ -f "$TEST_DIRECTORY/$emacs_tests" ]; then
 			load_emacs_tests="--eval '(load \"$emacs_tests\")'"
 		else
-- 
1.8.4.2