From: Tomi Ollila Date: Wed, 15 Jan 2014 19:02:03 +0000 (+0200) Subject: [PATCH v2] test: leave T\d\d\d- in variable $this_test and introduce $this_test_bare X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8ef2448eb0eb3ea17def3cf7cbd52b4a463f0edb;p=notmuch-archives.git [PATCH v2] test: leave T\d\d\d- in variable $this_test and introduce $this_test_bare --- diff --git a/26/b7d714b170032206ca75e5022e1729334520c8 b/26/b7d714b170032206ca75e5022e1729334520c8 new file mode 100644 index 000000000..c615788fb --- /dev/null +++ b/26/b7d714b170032206ca75e5022e1729334520c8 @@ -0,0 +1,98 @@ +Return-Path: +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 1C6BC431FBF + for ; Wed, 15 Jan 2014 11:02:18 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 1.312 +X-Spam-Level: * +X-Spam-Status: No, score=1.312 tagged_above=-999 required=5 + tests=[GAPPY_SUBJECT=1.312] 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 pRWBg2MGJgb0 for ; + Wed, 15 Jan 2014 11:02:10 -0800 (PST) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id A5F90431FAF + for ; Wed, 15 Jan 2014 11:02:10 -0800 (PST) +Received: by guru.guru-group.fi (Postfix, from userid 501) + id 5CF961001E5; Wed, 15 Jan 2014 21:02:06 +0200 (EET) +From: Tomi Ollila +To: notmuch@notmuchmail.org +Subject: [PATCH v2] test: leave T\d\d\d- in variable $this_test and introduce + $this_test_bare +Date: Wed, 15 Jan 2014 21:02:03 +0200 +Message-Id: <1389812523-17278-1-git-send-email-tomi.ollila@iki.fi> +X-Mailer: git-send-email 1.8.0 +In-Reply-To: <877ga2jdf6.fsf@zancas.localnet> +References: <877ga2jdf6.fsf@zancas.localnet> +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." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Wed, 15 Jan 2014 19:02:18 -0000 + +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@iki.fi + +Ignore id:1389812307-17065-1-git-send-email-tomi.ollila@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 +