From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Tue, 12 Nov 2013 20:41:06 +0000 (+0200)
Subject: [PATCH 1/3] test: resolve `basename "$0" .sh` once for all in test-lib.sh
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=93b4e32288a92d4e3d8f15ca2ce4cff7104cc707;p=notmuch-archives.git

[PATCH 1/3] test: resolve `basename "$0" .sh` once for all in test-lib.sh
---

diff --git a/a1/ce5a6af753e3fb539d2a1c26cb16ae0ee1a570 b/a1/ce5a6af753e3fb539d2a1c26cb16ae0ee1a570
new file mode 100644
index 000000000..092a351e6
--- /dev/null
+++ b/a1/ce5a6af753e3fb539d2a1c26cb16ae0ee1a570
@@ -0,0 +1,115 @@
+Return-Path: <too@guru-group.fi>
+X-Original-To: notmuch@notmuchmail.org
+Delivered-To: notmuch@notmuchmail.org
+Received: from localhost (localhost [127.0.0.1])
+	by olra.theworths.org (Postfix) with ESMTP id 308CF431FDC
+	for <notmuch@notmuchmail.org>; Tue, 12 Nov 2013 12:41:22 -0800 (PST)
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
+X-Spam-Flag: NO
+X-Spam-Score: 0
+X-Spam-Level: 
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
+	autolearn=disabled
+Received: from olra.theworths.org ([127.0.0.1])
+	by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id hF8o721EUuIK for <notmuch@notmuchmail.org>;
+	Tue, 12 Nov 2013 12:41:16 -0800 (PST)
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
+	by olra.theworths.org (Postfix) with ESMTP id 8722D431FCF
+	for <notmuch@notmuchmail.org>; Tue, 12 Nov 2013 12:41:16 -0800 (PST)
+Received: by guru.guru-group.fi (Postfix, from userid 501)
+	id 30DE810009D; Tue, 12 Nov 2013 22:41:10 +0200 (EET)
+From: Tomi Ollila <tomi.ollila@iki.fi>
+To: notmuch@notmuchmail.org
+Subject: [PATCH 1/3] test: resolve `basename "$0" .sh` once for all in
+	test-lib.sh
+Date: Tue, 12 Nov 2013 22:41:06 +0200
+Message-Id: <1384288868-23903-1-git-send-email-tomi.ollila@iki.fi>
+X-Mailer: git-send-email 1.8.0
+Cc: tomi.ollila@iki.fi
+X-BeenThere: notmuch@notmuchmail.org
+X-Mailman-Version: 2.1.13
+Precedence: list
+List-Id: "Use and development of the notmuch mail system."
+	<notmuch.notmuchmail.org>
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>
+List-Post: <mailto:notmuch@notmuchmail.org>
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
+X-List-Received-Date: Tue, 12 Nov 2013 20:41:22 -0000
+
+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.
+---
+ test/test-lib.sh | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/test/test-lib.sh b/test/test-lib.sh
+index 2aa4dfc..808bb7f 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
+ 
+@@ -956,7 +959,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
+@@ -1015,7 +1018,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
+@@ -1129,7 +1132,6 @@ else
+ 	exec 4>test.output 3>&4
+ fi
+ 
+-this_test=${0##*/}
+ for skp in $NOTMUCH_SKIP_TESTS
+ do
+ 	to_skip=
+-- 
+1.8.3.1
+