Skip to content

Commit 1767c51

Browse files
peffgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 3c84ac8 commit 1767c51

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

t/lib-httpd.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ then
3737
test_done
3838
fi
3939

40-
if ! test_have_prereq SANITY; then
40+
if ! test_have_prereq NOT_ROOT; then
4141
test_skip_or_die $GIT_TEST_HTTPD \
4242
"Cannot run httpd tests as root"
4343
fi

t/test-lib.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -992,6 +992,11 @@ test_lazy_prereq USR_BIN_TIME '
992992
test -x /usr/bin/time
993993
'
994994

995+
test_lazy_prereq NOT_ROOT '
996+
uid=$(id -u) &&
997+
test "$uid" != 0
998+
'
999+
9951000
# When the tests are run as root, permission tests will report that
9961001
# things are writable when they shouldn't be.
9971002
test -w / || test_set_prereq SANITY

0 commit comments

Comments
 (0)