aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-11-29 10:41:05 +0900
committerJunio C Hamano <gitster@pobox.com>2022-11-29 10:41:05 +0900
commit8165c6af118b0b484dedf7df1be19645461db923 (patch)
tree0b56c047e8fe6b68e7af3617b398d062e16bbb10
parent8a40cb1e5a0cd758a52877affdc84c024863bf75 (diff)
parent14903c8e9208a4562e3fbc52614e4adb731e31e0 (diff)
downloadgit-8165c6af118b0b484dedf7df1be19645461db923.tar.gz
Merge branch 'jh/trace2-timers-and-counters'
Test fix. * jh/trace2-timers-and-counters: trace2 tests: guard pthread test with "PTHREAD"
-rwxr-xr-xt/t0211-trace2-perf.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t0211-trace2-perf.sh b/t/t0211-trace2-perf.sh
index 0b3436e8ca..b4e9135118 100755
--- a/t/t0211-trace2-perf.sh
+++ b/t/t0211-trace2-perf.sh
@@ -203,7 +203,7 @@ test_expect_success 'stopwatch timer test/test1' '
have_timer_event "main" "timer" "test" "test1" 5 actual
'
-test_expect_success 'stopwatch timer test/test2' '
+test_expect_success PTHREAD 'stopwatch timer test/test2' '
test_when_finished "rm trace.perf actual" &&
test_config_global trace2.perfBrief 1 &&
test_config_global trace2.perfTarget "$(pwd)/trace.perf" &&
@@ -249,7 +249,7 @@ test_expect_success 'global counter test/test1' '
have_counter_event "main" "counter" "test" "test1" 15 actual
'
-test_expect_success 'global counter test/test2' '
+test_expect_success PTHREAD 'global counter test/test2' '
test_when_finished "rm trace.perf actual" &&
test_config_global trace2.perfBrief 1 &&
test_config_global trace2.perfTarget "$(pwd)/trace.perf" &&