added nonempty as suggested by David Danier <david.danier@team23.de>

[perl-fuse.git] / test / helper.pm

diff --git a/test/helper.pm b/test/helper.pm
index cd2bd55..817b146 100644 (file)
--- a/test/helper.pm
+++ b/test/helper.pm
@@ -2,14 +2,17 @@
 package test::helper;
 use strict;
 use Exporter;
+use Config;
+use POSIX qw(WEXITSTATUS);
 our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
 @ISA = "Exporter";
 @EXPORT_OK = qw($_loop $_point $_pidfile $_real);
-our($_loop, $_point, $_pidfile, $_real) = ("examples/loopback.pl","/mnt","test/s/mounted.pid","/tmp/fusetest");
+our($_loop, $_point, $_pidfile, $_real) = ("","/tmp/fusemnt-".$ENV{LOGNAME},"test/s/mounted.pid","/tmp/fusetest-".$ENV{LOGNAME});
+$_loop = $Config{useithreads} ? "examples/loopback_t.pl" : "examples/loopback.pl";
 if($0 !~ qr|s/u?mount\.t$|) {
        my ($reject) = 1;
        if(-f $_pidfile) {
-               unless(system("ps `cat $_pidfile` | grep \"$_loop $_point\" >/dev/null")>>8) {
+               unless(POSIX::WEXITSTATUS(system("ps `cat $_pidfile` | grep \"$_loop $_point\" >/dev/null"))) {
                        if(`mount | grep "on $_point"`) {
                                $reject = 0;
                        } else {
@@ -17,7 +20,8 @@ if($0 !~ qr|s/u?mount\.t$|) {
                        }
                }
        }
-       $reject = 1 if (system("ls $_point >&/dev/null") >> 8);
+       system("ls $_point >&/dev/null");
+       $reject = 1 if (POSIX::WEXITSTATUS($?));
        die "not properly mounted\n" if $reject;
 }
 1;