From: Thomas Rast <trast@student.ethz.ch>
To: Junio C Hamano <gitster@pobox.com>
Cc: <git@vger.kernel.org>
Subject: [PATCH 1/2] perf: load test-lib-functions from the correct directory
Date: Thu, 8 Mar 2012 09:54:54 +0100 [thread overview]
Message-ID: <14709b4345420da36a9152904bef4cc4503f78e4.1331196679.git.trast@student.ethz.ch> (raw)
In-Reply-To: <7v7gyvkh84.fsf@alter.siamese.dyndns.org>
Loading it in the subshells still referred to $TEST_DIRECTORY/..,
which was only correct in preliminary versions of perf-lib.sh
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---
This and the next one fix two small bugs in the perf test suite. They
don't affect anyone so far, which is why they went unnoticed.
t/perf/p0000-perf-lib-sanity.sh | 5 +++++
t/perf/perf-lib.sh | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/t/perf/p0000-perf-lib-sanity.sh b/t/perf/p0000-perf-lib-sanity.sh
index 2ca4aac..f8dd536 100755
--- a/t/perf/p0000-perf-lib-sanity.sh
+++ b/t/perf/p0000-perf-lib-sanity.sh
@@ -38,4 +38,9 @@ test_expect_success 'test_export works with weird vars' '
test "$bar" = "weird # variable"
'
+test_perf 'test-lib-functions correctly loaded in subshells' '
+ : >a &&
+ test_path_is_file a
+'
+
test_done
diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
index 2a5e1f3..bcc0131 100644
--- a/t/perf/perf-lib.sh
+++ b/t/perf/perf-lib.sh
@@ -119,7 +119,7 @@ test_run_perf_ () {
test_export_="test_cleanup"
export test_cleanup test_export_
/usr/bin/time -f "%E %U %S" -o test_time.$i "$SHELL" -c '
-. '"$TEST_DIRECTORY"/../test-lib-functions.sh'
+. '"$TEST_DIRECTORY"/test-lib-functions.sh'
test_export () {
[ $# != 0 ] || return 0
test_export_="$test_export_\\|$1"
--
1.7.9.3.556.g7eb2d
next prev parent reply other threads:[~2012-03-08 8:55 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-08 1:35 [ANNOUNCE] Git 1.7.10-rc0 Junio C Hamano
2012-03-08 6:30 ` Jeff King
2012-03-08 6:42 ` Junio C Hamano
2012-03-08 6:46 ` Junio C Hamano
2012-03-08 6:53 ` Jeff King
2012-03-08 19:55 ` Junio C Hamano
2012-03-08 8:54 ` Thomas Rast [this message]
2012-03-08 8:54 ` [PATCH 2/2] perf: export some important test-lib variables Thomas Rast
2012-09-17 13:15 ` Ramkumar Ramachandra
2012-03-08 10:17 ` [ANNOUNCE] Git 1.7.10-rc0 Thomas Rast
2012-03-08 10:29 ` Nguyen Thai Ngoc Duy
2012-03-08 19:55 ` Junio C Hamano
2012-03-08 10:42 ` Jakub Narebski
2012-03-08 16:28 ` Junio C Hamano
2012-03-08 16:55 ` Jakub Narebski
2012-03-08 20:05 ` Junio C Hamano
2012-03-08 13:18 ` Tim Henigan
2012-03-08 20:07 ` Junio C Hamano
2012-03-09 13:35 ` [PATCH] RelNotes: noted the addition of contrib/diffall Tim Henigan
2012-03-09 18:15 ` Junio C Hamano
2012-03-09 18:41 ` Tim Henigan
2012-03-08 15:17 ` [ANNOUNCE] Git 1.7.10-rc0 Marc Branchaud
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=14709b4345420da36a9152904bef4cc4503f78e4.1331196679.git.trast@student.ethz.ch \
--to=trast@student.ethz.ch \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).