t5550: add ICONV prereq to tests that use "$HTTPD_URL/error"
We've got a bunch of tests in t5550 that connect to "$HTTPD_URL/error" to ensure that error messages are properly forwarded. This URL executes the "t/lib-httpd/error.sh" script, which in turn depends on the iconv(1) executable to reencode the message. This executable may not exist on platforms, which will make the tests fail. Guard them with the ICONV prereq to fix such failures. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Patrick Steinhardt committed
Feb 20, 2026 at 09:26 UTC
c70bea26c763ae0caa170af84c92128b533dd1e9
1 file changed
+10
-10
t/t5550-http-fetch-dumb.sh
+10
-10
@@ -339,32 +339,32 @@ test_expect_success 'fetch can handle previously-fetched .idx files' '
339
'
340
341
test_expect_success 'did not use upload-pack service' '
342
- ! grep "/git-upload-pack" "$HTTPD_ROOT_PATH/access.log"
342
+ test_grep ! "/git-upload-pack" "$HTTPD_ROOT_PATH/access.log"
343
'
344
345
-test_expect_success 'git client shows text/plain errors' '
345
+test_expect_success ICONV 'git client shows text/plain errors' '
346
test_must_fail git clone "$HTTPD_URL/error/text" 2>stderr &&
347
- grep "this is the error message" stderr
347
+ test_grep "this is the error message" stderr
348
'
349
350
-test_expect_success 'git client does not show html errors' '
350
+test_expect_success ICONV 'git client does not show html errors' '
351
test_must_fail git clone "$HTTPD_URL/error/html" 2>stderr &&
352
- ! grep "this is the error message" stderr
352
+ test_grep ! "this is the error message" stderr
353
'
354
355
-test_expect_success 'git client shows text/plain with a charset' '
355
+test_expect_success ICONV 'git client shows text/plain with a charset' '
356
test_must_fail git clone "$HTTPD_URL/error/charset" 2>stderr &&
357
- grep "this is the error message" stderr
357
+ test_grep "this is the error message" stderr
358
'
359
360
test_expect_success ICONV 'http error messages are reencoded' '
361
test_must_fail git clone "$HTTPD_URL/error/utf16" 2>stderr &&
362
- grep "this is the error message" stderr
362
+ test_grep "this is the error message" stderr
363
'
364
365
test_expect_success ICONV 'reencoding is robust to whitespace oddities' '
366
test_must_fail git clone "$HTTPD_URL/error/odd-spacing" 2>stderr &&
367
- grep "this is the error message" stderr
367
+ test_grep "this is the error message" stderr
368
'
369
370
check_language () {
@@ -406,7 +406,7 @@ ja;q=0.95, zh;q=0.94, sv;q=0.93, pt;q=0.92, nb;q=0.91, *;q=0.90" \
406
407
test_expect_success 'git client send an empty Accept-Language' '
408
GIT_TRACE_CURL=true LANGUAGE= git ls-remote "$HTTPD_URL/dumb/repo.git" 2>stderr &&
409
- ! grep "^=> Send header: Accept-Language:" stderr
409
+ test_grep ! "^=> Send header: Accept-Language:" stderr
410
'
411
412
test_expect_success 'remote-http complains cleanly about malformed urls' '