[PATCH] t/lib-httpd: switch SANITY check for NOT_ROOT
- From
Jeff King <peff@peff.net>
- Date
- Jan 16, 2015, 01:32 UTC
- Message-ID
- <20150116013256.GA25894@peff.net>
- In-Reply-To
- <xmqqh9vr4mlz.fsf@gitster.dls.corp.google.com>
On Thu, Jan 15, 2015 at 04:04:24PM -0800, Junio C Hamano wrote:
> I wondered what 'perl -e 'print $>' would say in mingw, and if that > is portable enough, though.
Good thinking. I guess the best way to find out is to convince somebody from msysgit to try this patch. :)
We may simply find that nobody there even has apache installed on their box, and they do not run the http tests at all.
-- >8 -- 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 perl's "$>" variable, since we cannot rely on the "id" program being available everywhere (and we would rather avoid writing a custom C program to run geteuid if we can).
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 perl was not installed or
barfed showing us $>We should conservatively treat (3) as "does not have the prerequisite", which means that a naive negation would not work.
Signed-off-by: Jeff King <peff@peff.net> --- t/lib-httpd.sh | 2 +- t/test-lib.sh | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh index fd53b57..d154d1e 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 diff --git a/t/test-lib.sh b/t/test-lib.sh index bb1402d..60020ca 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1040,3 +1040,8 @@ test_lazy_prereq UNZIP ' "$GIT_UNZIP" -v test $? -ne 127 ' + +test_lazy_prereq NOT_ROOT ' + uid=$(perl -e "print \$<") && + test "$uid" != 0 +'
-- 2.2.1.425.g441bb3c -- -- *** Please reply-to-all at all times *** *** (do not pretend to know who is subscribed and who is not) *** *** Please avoid top-posting. *** The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free. You received this message because you are subscribed to the Google Groups "msysGit" group. To post to this group, send email to msysgit@googlegroups.com To unsubscribe from this group, send email to msysgit+unsubscribe@googlegroups.com For more options, and view previous threads, visit this group at http://groups.google.com/group/msysgit?hl=en_US?hl=en --- You received this message because you are subscribed to the Google Groups "Git for Windows" group. To unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com. For more options, visit https://groups.google.com/d/optout.