diff options
| author | Jeff King <peff@peff.net> | 2015-01-16 04:16:49 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-01-16 09:33:46 -0800 |
| commit | 1767c51787f2a9aaf99716a48e8928618c1c9481 (patch) | |
| tree | 4f7c8480da28c0b4452b6230fff94df38b56dcf8 /t/lib-httpd.sh | |
| parent | 3c84ac86fc896c108b789b8eb26b169cc0e8088a (diff) | |
| download | git-1767c51787f2a9aaf99716a48e8928618c1c9481.tar.gz git-1767c51787f2a9aaf99716a48e8928618c1c9481.tar.xz | |
t/lib-httpd: switch SANITY check for NOT_ROOT
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 <mackyle@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/lib-httpd.sh')
| -rw-r--r-- | t/lib-httpd.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh index fd53b5718..d154d1ed1 100644 --- a/t/lib-httpd.sh +++ b/t/lib-httpd.sh @@ -37,7 +37,7 @@ then test_done fi -if ! test_have_prereq SANITY; then +if ! test_have_prereq NOT_ROOT; then test_skip_or_die $GIT_TEST_HTTPD \ "Cannot run httpd tests as root" fi |