Skip to contentSkip to conversation

add missing LIBCURL prereq to a few tests

PATCH In review Martin Ågren 2 participants 4 messages Sep 11, 2024

lore
Share & tools
lore
#0 lore raw

cover add missing LIBCURL prereq to a few tests

Hi,

I recently had reason to build Git without libcurl. That surfaced two test scripts that use git http-fetch or similar without giving the LIBCURL prerequisite.

Martin

Martin Ågren (2):
t1517: add missing LIBCURL prereq
t0211: add missing LIBCURL prereq

 t/t0211-trace2-perf.sh  | 6 ++++--
 t/t1517-outside-repo.sh | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)
Signature · 1 line
2.46.0.733.g1eb83ef1a1
#1 lore raw

PATCH 1/2 t1517: add missing LIBCURL prereq

After building Git with NO_LIBCURL, there is no git remote-http, so it's not meaningful to test that it can run outside of a repository. Indeed, that test will fail. Add the LIBCURL prereq to it.

---
This is from b25ec8b8d5 (t1517: more coverage for commands that work without repository, 2024-05-31), which first appeared in 2.46.0.

 t/t1517-outside-repo.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
t/t1517-outside-repo.sh +1 -1
index 990a036582..342defbb61 100755
@@ -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 &&
 	(
Signature · 1 line
2.46.0.733.g1eb83ef1a1
#2 lore raw

PATCH 2/2 t0211: add missing LIBCURL prereq

In reply to Martin Ågren

After building Git with NO_LIBCURL, we're lacking git remote-http and git http-fetch, so when we test that they trace as they should, we're bound to fail. Add the LIBCURL prereq to those tests.

---
This is from around 6111252cbf (trace2: emit 'def_param' set with 'cmd_name' event, 2024-03-07), which first appeared in 2.45.0.

 t/t0211-trace2-perf.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
t/t0211-trace2-perf.sh +4 -2
index 070fe7a5da..dddc130560 100755
@@ -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.*" &&
Signature · 1 line
2.46.0.733.g1eb83ef1a1
#3 lore raw
In reply to Martin Ågren
Quoted 8 lines · Martin Ågren

Hi,

I recently had reason to build Git without libcurl. That surfaced two test scripts that use git http-fetch or similar without giving the LIBCURL prerequisite.

Martin

Quoted 7 lines

Martin Ågren (2):
t1517: add missing LIBCURL prereq
t0211: add missing LIBCURL prereq

 t/t0211-trace2-perf.sh  | 6 ++++--
 t/t1517-outside-repo.sh | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

Thanks.