diff options
| author |  Jeff King <peff@peff.net> | 2014-05-22 05:28:56 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-05-23 12:41:50 -0700 |
| commit | c7db2d16474874b21aad9141e6856f836f719643 (patch) | |
| tree | f24028c4fd5cdbd30b4471c12cad1faf6edceac3 | |
| parent | test-lib: preserve GIT_CURL_VERBOSE from the environment (diff) | |
| download | tgif-c7db2d16474874b21aad9141e6856f836f719643.tar.xz | |
t/lib-httpd: use write_script to copy CGI scripts
Using write_script will set our shebang line appropriately
with $SHELL_PATH. The script that is there now is quite
simple and likely to succeed even with a non-POSIX /bin/sh,
but it does not hurt to be defensive.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | t/lib-httpd.sh | 6 | ||||
| -rw-r--r--[-rwxr-xr-x] | t/lib-httpd/broken-smart-http.sh | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh index 252cbf163b..8e680efbf0 100644 --- a/t/lib-httpd.sh +++ b/t/lib-httpd.sh @@ -105,10 +105,14 @@ else "Could not identify web server at '$LIB_HTTPD_PATH'" fi +install_script () { + write_script "$HTTPD_ROOT_PATH/$1" <"$TEST_PATH/$1" +} + prepare_httpd() { mkdir -p "$HTTPD_DOCUMENT_ROOT_PATH" cp "$TEST_PATH"/passwd "$HTTPD_ROOT_PATH" - cp "$TEST_PATH"/broken-smart-http.sh "$HTTPD_ROOT_PATH" + install_script broken-smart-http.sh ln -s "$LIB_HTTPD_MODULE_PATH" "$HTTPD_ROOT_PATH/modules" diff --git a/t/lib-httpd/broken-smart-http.sh b/t/lib-httpd/broken-smart-http.sh index f7ebfffa80..82cc610b0a 100755..100644 --- a/t/lib-httpd/broken-smart-http.sh +++ b/t/lib-httpd/broken-smart-http.sh @@ -1,4 +1,3 @@ -#!/bin/sh printf "Content-Type: text/%s\n" "html" echo printf "%s\n" "001e# service=git-upload-pack" |