package test::helper;
use strict;
use Exporter;
+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) = ("examples/loopback.pl","/tmp/fusemnt-".$ENV{LOGNAME},"test/s/mounted.pid","/tmp/fusetest-".$ENV{LOGNAME});
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 {
}
}
}
- $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;