Integrate with Sarathy.

[p5sagit/p5-mst-13.2.git] / t / op / filetest.t

diff --git a/t/op/filetest.t b/t/op/filetest.t
old mode 100755 (executable)
new mode 100644 (file)
index 7e03c42..e00d5fb
--- a/t/op/filetest.t
+++ b/t/op/filetest.t
@@ -3,11 +3,12 @@
 # There are few filetest operators that are portable enough to test.
 # See pod/perlport.pod for details.
 
-use Config;
 BEGIN {
     chdir 't' if -d 't';
+    unshift @INC, '../lib' if -d '../lib';
 }
 
+use Config;
 print "1..10\n";
 
 print "not " unless -d 'op';
@@ -34,7 +35,10 @@ eval '$> = 1';               # so switch uid (may not be implemented)
 
 print "# oldeuid = $oldeuid, euid = $>\n";
 
-if ($bad_chmod) {
+if (!$Config{d_seteuid}) {
+    print "ok 6 #skipped, no seteuid\n";
+}
+elsif ($bad_chmod) {
     print "#[$@]\nok 6 #skipped\n";
 }
 else {
@@ -44,11 +48,13 @@ else {
 
 # Scripts are not -x everywhere so cannot test that.
 
+eval '$> = $oldeuid';  # switch uid back (may not be implemented)
+
+# this would fail for the euid 1
+# (unless we have unpacked the source code as uid 1...)
 print "not " unless -r 'op';
 print "ok 7\n";
 
-eval '$> = $oldeuid';  # switch uid back (may not be implemented)
-
 # this would fail for the euid 1
 # (unless we have unpacked the source code as uid 1...)
 if ($Config{d_seteuid}) {