test-lib tests: avoid subshell for "test_cmp" for readability

[thirdparty/git.git] / t / lib-subtest.sh

diff --git a/t/lib-subtest.sh b/t/lib-subtest.sh
index cdbc2d933206bb966add3d8db6b217861ae6bda4..0737fab98ad4cfd7da6fc4ecd81988c3b17fda0c 100644 (file)
--- a/t/lib-subtest.sh
+++ b/t/lib-subtest.sh
@@ -79,22 +79,16 @@ run_sub_test_lib_test_err () {
 
 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
-       )
+       test_must_be_empty "$name"/err &&
+       sed -e 's/^> //' -e 's/Z$//' >"$name"/expect &&
+       test_cmp "$name/"expect "$name"/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
-       )
+       sed -e 's/^> //' -e 's/Z$//' >"$name"/expect.out &&
+       test_cmp "$name"/expect.out "$name"/out &&
+       sed -e 's/^> //' -e 's/Z$//' <&3 >"$name"/expect.err &&
+       test_cmp "$name"/expect.err "$name"/err
 }