git/t/lib-httpd.sh, branch v2.4.9

Merge branch 'jk/skip-http-tests-under-no-curl' into maint

2015-06-05T19:00:28Z

Test clean-up. * jk/skip-http-tests-under-no-curl: tests: skip dav http-push tests under NO_EXPAT=NoThanks t/lib-httpd.sh: skip tests if NO_CURL is defined

tests: skip dav http-push tests under NO_EXPAT=NoThanks

2015-05-07T16:48:43Z

When built with NO_EXPAT=NoThanks, we will not have a working http-push over webdav. Signed-off-by: Junio C Hamano

t/lib-httpd.sh: skip tests if NO_CURL is defined

2015-05-07T15:26:02Z

If we built git without curl, we can't actually test against an http server. In fact, all of the test scripts which include lib-httpd.sh already perform this check, with one exception: t5540. For those scripts, this is a noop, and for t5540, this is a bugfix (it used to fail when built with NO_CURL, though it could go unnoticed if you had a stale git-remote-https in your build directory). Noticed-by: Junio C Hamano Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

t: pass GIT_TRACE through Apache

2015-03-13T06:25:06Z

Apache removes GIT_TRACE from the environment before running git-http-backend. This can make it hard to debug the server side of an http session. Let's let it through. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

t/lib-httpd: switch SANITY check for NOT_ROOT

2015-01-16T17:33:46Z

The SANITY prerequisite is really about whether the filesystem will respect the permissions we set, and being root is only one part of that. But the httpd tests really just care about not being root, as they are trying to avoid weirdness in apache (see a1a3011 for details). Let's switch out SANITY for a new NOT_ROOT prerequisite, which will let us tweak SANITY more freely. We implement NOT_ROOT by checking `id -u`, which is in POSIX and seems to be available even on MSYS. Note that we cannot just call this "ROOT" and ask for "!ROOT". The possible outcomes are: 1. we know we are root 2. we know we are not root 3. we could not tell, because `id` was not available We should conservatively treat (3) as "does not have the prerequisite", which means that a naive negation would not work. Helped-by: Kyle J. McKay Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'ep/avoid-test-a-o'

2014-06-25T19:23:56Z

Update tests and scripts to avoid "test ... -a ...", which is often more error-prone than "test ... && test ...". Squashed misconversion fix-up into git-submodule.sh updates. * ep/avoid-test-a-o: git-submodule.sh: avoid "echo" path-like values git-submodule.sh: avoid "test -a/-o " t/test-lib-functions.sh: avoid "test -a/-o " t/t9814-git-p4-rename.sh: avoid "test -a/-o " t/t5538-push-shallow.sh: avoid "test -a/-o " t/t5403-post-checkout-hook.sh: avoid "test -a/-o " t/t5000-tar-tree.sh: avoid "test -a/-o " t/t4102-apply-rename.sh: avoid "test -a/-o " t/t0026-eol-config.sh: avoid "test -a/-o " t/t0025-crlf-auto.sh: avoid "test -a/-o " t/lib-httpd.sh: avoid "test -a/-o " git-rebase--interactive.sh: avoid "test -a/-o " git-mergetool.sh: avoid "test -a/-o " git-bisect.sh: avoid "test -a/-o " contrib/examples/git-resolve.sh: avoid "test -a/-o " contrib/examples/git-repack.sh: avoid "test -a/-o " contrib/examples/git-merge.sh: avoid "test -a/-o " contrib/examples/git-commit.sh: avoid "test -a/-o " contrib/examples/git-clone.sh: avoid "test -a/-o " check_bindir: avoid "test -a/-o "

Merge branch 'jk/http-errors'

2014-06-16T19:18:36Z

Propagate the error messages from the webserver better to the client coming over the HTTP transport. * jk/http-errors: http: default text charset to iso-8859-1 remote-curl: reencode http error messages strbuf: add strbuf_reencode helper http: optionally extract charset parameter from content-type http: extract type/subtype portion of content-type t5550: test display of remote http error messages t/lib-httpd: use write_script to copy CGI scripts test-lib: preserve GIT_CURL_VERBOSE from the environment

Merge branch 'jk/do-not-run-httpd-tests-as-root'

2014-06-16T17:06:05Z

* jk/do-not-run-httpd-tests-as-root: t/lib-httpd: require SANITY prereq

t/lib-httpd.sh: avoid "test -a/-o "

2014-06-09T22:53:41Z

The construct is error-prone; "test" being built-in in most modern shells, the reason to avoid "test && test " spawning one extra process by using a single "test -a " no longer exists. Signed-off-by: Elia Pinto Reviewed-by: Matthieu Moy Signed-off-by: Junio C Hamano

t5550: test display of remote http error messages

2014-05-23T19:43:51Z

Since commit 426e70d (remote-curl: show server content on http errors, 2013-04-05), we relay any text/plain error messages from the remote server to the user. However, we never tested it. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano