Skip to content

Commit

Permalink
Merge branch 'ma/test-libcurl-prereq' into next
Browse files Browse the repository at this point in the history
Test portability fix.

* ma/test-libcurl-prereq:
  t0211: add missing LIBCURL prereq
  t1517: add missing LIBCURL prereq
  • Loading branch information
gitster committed Sep 13, 2024
2 parents 0ab66e7 + 86b93bd commit 6d4ad6b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 4 additions & 2 deletions t/t0211-trace2-perf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,8 @@ test_expect_success 'expect def_params for query command' '
# remote-curl.c rather than git.c. Confirm that we get def_param
# events from both layers.
#
test_expect_success 'expect def_params for remote-curl and _run_dashed_' '
test_expect_success LIBCURL \
'expect def_params for remote-curl and _run_dashed_' '
test_when_finished "rm prop.perf actual" &&
test_config_global "trace2.configParams" "cfg.prop.*" &&
Expand Down Expand Up @@ -366,7 +367,8 @@ test_expect_success 'expect def_params for remote-curl and _run_dashed_' '
# an executable built from http-fetch.c. Confirm that we get
# def_param events from both layers.
#
test_expect_success 'expect def_params for http-fetch and _run_dashed_' '
test_expect_success LIBCURL \
'expect def_params for http-fetch and _run_dashed_' '
test_when_finished "rm prop.perf actual" &&
test_config_global "trace2.configParams" "cfg.prop.*" &&
Expand Down
2 changes: 1 addition & 1 deletion t/t1517-outside-repo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ test_expect_success 'stripspace outside repository' '
nongit git stripspace -s </dev/null
'

test_expect_success 'remote-http outside repository' '
test_expect_success LIBCURL 'remote-http outside repository' '
test_must_fail git remote-http 2>actual &&
test_grep "^error: remote-curl" actual &&
(
Expand Down

0 comments on commit 6d4ad6b

Please sign in to comment.