Skip to content
Snippets Groups Projects
Commit 561ae067 authored by Thomas Rast's avatar Thomas Rast Committed by Junio C Hamano
Browse files

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: default avatarThomas Rast <trast@student.ethz.ch>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent 1cbc3240
Branches
Tags
No related merge requests found
...@@ -38,9 +38,18 @@ test_expect_success 'test_export works with weird vars' ' ...@@ -38,9 +38,18 @@ test_expect_success 'test_export works with weird vars' '
test "$bar" = "weird # variable" 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' ' test_perf 'test-lib-functions correctly loaded in subshells' '
: >a && : >a &&
test_path_is_file a test_path_is_file a &&
: >b &&
test_cmp a b
' '
test_done test_done
...@@ -45,6 +45,10 @@ TEST_NO_CREATE_REPO=t ...@@ -45,6 +45,10 @@ TEST_NO_CREATE_REPO=t
. ../test-lib.sh . ../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 perf_results_dir=$TEST_OUTPUT_DIRECTORY/test-results
mkdir -p "$perf_results_dir" mkdir -p "$perf_results_dir"
rm -f "$perf_results_dir"/$(basename "$0" .sh).subtests rm -f "$perf_results_dir"/$(basename "$0" .sh).subtests
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment