Merge branch 'jc/post-c89-rules-doc' into maint

diff --git a/t/t0210-trace2-normal.sh b/t/t0210-trace2-normal.sh
index 71194a3623c61bd7ddf1ccfd0e2da8a3ea065dfe..ce7574edb1e772fca30044ceb8a7cf3ac2e19470 100755 (executable)
--- a/t/t0210-trace2-normal.sh
+++ b/t/t0210-trace2-normal.sh
@@ -4,9 +4,9 @@ test_description='test trace2 facility (normal target)'
 . ./test-lib.sh
 
 # Turn off any inherited trace2 settings for this test.
-sane_unset GIT_TR2 GIT_TR2_PERF GIT_TR2_EVENT
-sane_unset GIT_TR2_BRIEF
-sane_unset GIT_TR2_CONFIG_PARAMS
+sane_unset GIT_TRACE2 GIT_TRACE2_PERF GIT_TRACE2_EVENT
+sane_unset GIT_TRACE2_BRIEF
+sane_unset GIT_TRACE2_CONFIG_PARAMS
 
 # Add t/helper directory to PATH so that we can use a relative
 # path to run nested instances of test-tool.exe (see 004child).
@@ -27,12 +27,12 @@ V=$(git version | sed -e 's/^git version //') && export V
 # to whatever filtering that target decides to do).
 # This script tests the normal target in isolation.
 #
-# Defer setting GIT_TR2 until the actual command line we want to test
+# Defer setting GIT_TRACE2 until the actual command line we want to test
 # because hidden git and test-tool commands run by the test harness
 # can contaminate our output.
 
 # Enable "brief" feature which turns off "<clock> <file>:<line> " prefix.
-GIT_TR2_BRIEF=1 && export GIT_TR2_BRIEF
+GIT_TRACE2_BRIEF=1 && export GIT_TRACE2_BRIEF
 
 # Basic tests of the trace2 normal stream.  Since this stream is used
 # primarily with printf-style debugging/tracing, we do limited testing
@@ -54,7 +54,7 @@ GIT_TR2_BRIEF=1 && export GIT_TR2_BRIEF
 
 test_expect_success 'normal stream, return code 0' '
        test_when_finished "rm trace.normal actual expect" &&
-       GIT_TR2="$(pwd)/trace.normal" test-tool trace2 001return 0 &&
+       GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 001return 0 &&
        perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
        cat >expect <<-EOF &&
                version $V
@@ -68,7 +68,7 @@ test_expect_success 'normal stream, return code 0' '
 
 test_expect_success 'normal stream, return code 1' '
        test_when_finished "rm trace.normal actual expect" &&
-       test_must_fail env GIT_TR2="$(pwd)/trace.normal" test-tool trace2 001return 1 &&
+       test_must_fail env GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 001return 1 &&
        perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
        cat >expect <<-EOF &&
                version $V
@@ -83,7 +83,7 @@ test_expect_success 'normal stream, return code 1' '
 test_expect_success 'automatic filename' '
        test_when_finished "rm -r traces actual expect" &&
        mkdir traces &&
-       GIT_TR2="$(pwd)/traces" test-tool trace2 001return 0 &&
+       GIT_TRACE2="$(pwd)/traces" test-tool trace2 001return 0 &&
        perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <"$(ls traces/*)" >actual &&
        cat >expect <<-EOF &&
                version $V
@@ -101,7 +101,7 @@ test_expect_success 'automatic filename' '
 
 test_expect_success 'normal stream, exit code 0' '
        test_when_finished "rm trace.normal actual expect" &&
-       GIT_TR2="$(pwd)/trace.normal" test-tool trace2 002exit 0 &&
+       GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 002exit 0 &&
        perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
        cat >expect <<-EOF &&
                version $V
@@ -115,7 +115,7 @@ test_expect_success 'normal stream, exit code 0' '
 
 test_expect_success 'normal stream, exit code 1' '
        test_when_finished "rm trace.normal actual expect" &&
-       test_must_fail env GIT_TR2="$(pwd)/trace.normal" test-tool trace2 002exit 1 &&
+       test_must_fail env GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 002exit 1 &&
        perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
        cat >expect <<-EOF &&
                version $V
@@ -133,7 +133,7 @@ test_expect_success 'normal stream, exit code 1' '
 
 test_expect_success 'normal stream, error event' '
        test_when_finished "rm trace.normal actual expect" &&
-       GIT_TR2="$(pwd)/trace.normal" test-tool trace2 003error "hello world" "this is a test" &&
+       GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 003error "hello world" "this is a test" &&
        perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
        cat >expect <<-EOF &&
                version $V
@@ -147,7 +147,7 @@ test_expect_success 'normal stream, error event' '
        test_cmp expect actual
 '
 
-sane_unset GIT_TR2_BRIEF
+sane_unset GIT_TRACE2_BRIEF
 
 # Now test without environment variables and get all Trace2 settings
 # from the global config.