9f0a45208d
Refactor the function to write and run tests of the test-lib.sh output into two functions. When this was added back in565b6fa87b(tests: refactor mechanics of testing in a sub test-lib, 2012-12-16) there was no reason to do this, but since we started supporting test arguments in517cd55fd5(test-lib: self-test that --verbose works, 2013-06-23) we've started to write out duplicate tests simply to test different arguments, now we'll be able to re-use them. This change doesn't consolidate any of those tests yet, it just makes it possible to do so. All the changes in t0000-basic.sh are a simple search-replacement. Since the _run_sub_test_lib_test_common() function doesn't handle running the test anymore we can do away with the sub-shell, which was used to scope an "unset" and "export" shell variables. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
105 lines
2.5 KiB
Bash
105 lines
2.5 KiB
Bash
write_sub_test_lib_test () {
|
|
name="$1" descr="$2" # stdin is the body of the test code
|
|
mkdir "$name" &&
|
|
write_script "$name/$name.sh" "$TEST_SHELL_PATH" <<-EOF &&
|
|
test_description='$descr (run in sub test-lib)
|
|
|
|
This is run in a sub test-lib so that we do not get incorrect
|
|
passing metrics
|
|
'
|
|
|
|
# Point to the t/test-lib.sh, which isn't in ../ as usual
|
|
. "\$TEST_DIRECTORY"/test-lib.sh
|
|
EOF
|
|
cat >>"$name/$name.sh"
|
|
}
|
|
|
|
_run_sub_test_lib_test_common () {
|
|
neg="$1" name="$2" descr="$3" # stdin is the body of the test code
|
|
shift 3
|
|
|
|
# intercept pseudo-options at the front of the argument list that we
|
|
# will not pass to child script
|
|
skip=
|
|
while test $# -gt 0
|
|
do
|
|
case "$1" in
|
|
--skip=*)
|
|
skip=${1#--*=}
|
|
shift
|
|
;;
|
|
*)
|
|
break
|
|
;;
|
|
esac
|
|
done
|
|
|
|
(
|
|
cd "$name" &&
|
|
|
|
# Pretend we're not running under a test harness, whether we
|
|
# are or not. The test-lib output depends on the setting of
|
|
# this variable, so we need a stable setting under which to run
|
|
# the sub-test.
|
|
sane_unset HARNESS_ACTIVE &&
|
|
|
|
export TEST_DIRECTORY &&
|
|
# The child test re-sources GIT-BUILD-OPTIONS and may thus
|
|
# override the test output directory. We thus pass it as an
|
|
# explicit override to the child.
|
|
TEST_OUTPUT_DIRECTORY_OVERRIDE=$(pwd) &&
|
|
export TEST_OUTPUT_DIRECTORY_OVERRIDE &&
|
|
GIT_SKIP_TESTS=$skip &&
|
|
export GIT_SKIP_TESTS &&
|
|
sane_unset GIT_TEST_FAIL_PREREQS &&
|
|
if test -z "$neg"
|
|
then
|
|
./"$name.sh" "$@" >out 2>err
|
|
else
|
|
! ./"$name.sh" "$@" >out 2>err
|
|
fi
|
|
)
|
|
}
|
|
|
|
write_and_run_sub_test_lib_test () {
|
|
name="$1" descr="$2" # stdin is the body of the test code
|
|
write_sub_test_lib_test "$@" || return 1
|
|
_run_sub_test_lib_test_common '' "$@"
|
|
}
|
|
|
|
write_and_run_sub_test_lib_test_err () {
|
|
name="$1" descr="$2" # stdin is the body of the test code
|
|
write_sub_test_lib_test "$@" || return 1
|
|
_run_sub_test_lib_test_common '!' "$@"
|
|
}
|
|
|
|
run_sub_test_lib_test () {
|
|
_run_sub_test_lib_test_common '' "$@"
|
|
}
|
|
|
|
run_sub_test_lib_test_err () {
|
|
_run_sub_test_lib_test_common '!' "$@"
|
|
}
|
|
|
|
check_sub_test_lib_test () {
|
|
name="$1" # stdin is the expected output from the test
|
|
(
|
|
cd "$name" &&
|
|
test_must_be_empty err &&
|
|
sed -e 's/^> //' -e 's/Z$//' >expect &&
|
|
test_cmp expect out
|
|
)
|
|
}
|
|
|
|
check_sub_test_lib_test_err () {
|
|
name="$1" # stdin is the expected output from the test
|
|
# expected error output is in descriptor 3
|
|
(
|
|
cd "$name" &&
|
|
sed -e 's/^> //' -e 's/Z$//' >expect.out &&
|
|
test_cmp expect.out out &&
|
|
sed -e 's/^> //' -e 's/Z$//' <&3 >expect.err &&
|
|
test_cmp expect.err err
|
|
)
|
|
}
|