use test::helper qw($_point $_loop $_real $_pidfile);
use strict;
use Test::More tests => 3;
-ok(!(scalar grep(/ on $_point /,`cat /proc/mounts`)),"already mounted");
+
+sub is_mounted {
+ my $diag = -e '/proc/mounts' ? `cat /proc/mounts` : `mount`;
+ return $diag =~ m{ (?:/private)?$_point };
+}
+
+ok(!is_mounted(),"already mounted");
ok(-f $_loop,"loopback exists");
if(!fork()) {
mkdir $_point;
mkdir $_real;
`echo $$ >test/s/mounted.pid`;
- exec("perl $_loop $_point");
+ diag "mounting $_loop to $_point";
+ open STDOUT, '>', '/tmp/fusemnt.log';
+ open STDERR, '>&', \*STDOUT;
+ exec("perl -Iblib/lib -Iblib/arch $_loop $_point");
exit(1);
}
-select(undef, undef, undef, 0.5);
-my ($success) = `cat /proc/mounts` =~ / $_point /;
+
+my ($success, $count) = (0,0);
+while ($count++ < 50 && !$success) {
+ select(undef, undef, undef, 0.1);
+ ($success) = is_mounted();
+}
+diag "Mounted in ", $count/10, " secs";
+
ok($success,"mount succeeded");
system("rm -rf $_real");
unless($success) {