kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'ma/test-libcurl-prereq' into maint-2.46 

Test portability fix.

* ma/test-libcurl-prereq:
  t0211: add missing LIBCURL prereq
  t1517: add missing LIBCURL prereq
maint
Junio C Hamano 2024-09-23 10:33:00 -07:00
parent 52c1a7322f 86b93bddeb
commit d497bd9d59
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
t/t0211-trace2-perf.sh
View File

@ -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.*" &&
@ -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.*" &&

2
t/t1517-outside-repo.sh
View File

@ -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 &&
(