diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-02-25 15:40:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-25 15:40:18 -0800 |
| commit | 75b49bb181555b25d316bbe427ba7feedd2a58da (patch) | |
| tree | 689c880151a20ee5cd6e2db36cca4f2d11a54673 /t/lib-httpd.sh | |
| parent | 4f5a4271ea3657ea79de4ccef20c29619c36d1c1 (diff) | |
| parent | f400e51c13eb4143e420d41d9b415d4f5ddbdb85 (diff) | |
| download | git-75b49bb181555b25d316bbe427ba7feedd2a58da.tar.xz | |
Merge branch 'jk/sanity'
The tests that wanted to see that file becomes unreadable after
running "chmod a-r file", and the tests that wanted to make sure it
is not run as root, we used "can we write into the / directory?" as
a cheap substitute, but on some platforms that is not a good
heuristics. The tests and their prerequisites have been updated to
check what they really require.
* jk/sanity:
test-lib.sh: set prerequisite SANITY by testing what we really need
tests: correct misuses of POSIXPERM
t/lib-httpd: switch SANITY check for NOT_ROOT
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 fd53b57187..d154d1ed1d 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 |