diff options
| author | Thomas Rast <trast@student.ethz.ch> | 2012-03-08 09:54:55 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-08 12:07:50 -0800 |
| commit | 561ae0673569f43a92ea6b0776ae0f4c01472dca (patch) | |
| tree | 2cd08b4294644ccc4aba74f2b1d4156ef39eeca9 | |
| parent | 1cbc32403b20f064ec7c295c6603f6fd16662bce (diff) | |
| download | git-561ae0673569f43a92ea6b0776ae0f4c01472dca.tar.gz | |
perf: export some important test-lib variables
The only bug right now is that $GIT_TEST_CMP is needed for test_cmp to
work.
However, we also export the three most important paths for tests:
TEST_DIRECTORY
TRASH_DIRECTORY
GIT_BUILD_DIR
Since they are available within test_expect_success, a future test
writer may expect them to also be defined in test_perf.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/perf/p0000-perf-lib-sanity.sh | 11 | ||||
| -rw-r--r-- | t/perf/perf-lib.sh | 4 |
2 files changed, 14 insertions, 1 deletions
diff --git a/t/perf/p0000-perf-lib-sanity.sh b/t/perf/p0000-perf-lib-sanity.sh index f8dd536709..cf8e1efce7 100755 --- a/t/perf/p0000-perf-lib-sanity.sh +++ b/t/perf/p0000-perf-lib-sanity.sh @@ -38,9 +38,18 @@ test_expect_success 'test_export works with weird vars' ' test "$bar" = "weird # variable" ' +test_perf 'important variables available in subshells' ' + test -n "$HOME" && + test -n "$TEST_DIRECTORY" && + test -n "$TRASH_DIRECTORY" && + test -n "$GIT_BUILD_DIR" +' + test_perf 'test-lib-functions correctly loaded in subshells' ' : >a && - test_path_is_file a + test_path_is_file a && + : >b && + test_cmp a b ' test_done diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh index bcc0131646..5580c22812 100644 --- a/t/perf/perf-lib.sh +++ b/t/perf/perf-lib.sh @@ -45,6 +45,10 @@ TEST_NO_CREATE_REPO=t . ../test-lib.sh +# Variables from test-lib that are normally internal to the tests; we +# need to export them for test_perf subshells +export TEST_DIRECTORY TRASH_DIRECTORY GIT_BUILD_DIR GIT_TEST_CMP + perf_results_dir=$TEST_OUTPUT_DIRECTORY/test-results mkdir -p "$perf_results_dir" rm -f "$perf_results_dir"/$(basename "$0" .sh).subtests |