Replace system() calls for 'touch' and friends with Perl ops for same.

If we don't need specific command functionality, we should use Perl calls
to effect the desired result. That way, we depend less on command specific
functionality, and invite less opportunity for platform-specific command
options giving us trouble.

diff --git a/test/chmod.t b/test/chmod.t
index 366f89b..1ccb3ef 100644 (file)
--- a/test/chmod.t
+++ b/test/chmod.t
@@ -3,7 +3,9 @@ use test::helper qw($_real $_point);
 use Test::More;
 plan tests => 4;
 chdir($_point);
-system("echo frog >file");
+open($file, '>', 'file');
+print $file "frog\n";
+close($file);
 ok(chmod(0644,"file"),"set unexecutable");
 ok(!-x "file","unexecutable");
 ok(chmod(0755,"file"),"set executable");

diff --git a/test/chown.t b/test/chown.t
index 45a811f..74adb14 100644 (file)
--- a/test/chown.t
+++ b/test/chown.t
@@ -6,7 +6,9 @@ plan tests => 4;
 
 my (@stat);
 chdir($_point);
-system("echo frog >file");
+open($file, '>', 'file');
+print $file "frog\n";
+close($file);
 
 SKIP: {
        skip('Need root to give away ownership', 4) unless ($UID == 0);

diff --git a/test/getdir.t b/test/getdir.t
index 1d60561..e6d402a 100644 (file)
--- a/test/getdir.t
+++ b/test/getdir.t
@@ -7,7 +7,10 @@ plan tests => 2 * scalar @names;
 chdir($_real);
 
 # create entries
-map { system("touch \"$_\"") } @names;
+foreach $fname (@names) {
+    open($file, '>', $fname);
+    close($file);
+}
 
 # make sure they exist in real dir
 opendir(REAL,$_real);

diff --git a/test/link.t b/test/link.t
index 391b2f0..f617c93 100644 (file)
--- a/test/link.t
+++ b/test/link.t
@@ -3,7 +3,9 @@ use test::helper qw($_real $_point);
 use Test::More;
 plan tests => 8;
 chdir($_point);
-system("echo hippity >womble");
+open($file, '>', 'womble');
+print $file "hippity\n";
+close($file);
 ok(-f "womble","exists");
 ok(!-f "rabbit","target file doesn't exist");
 is(-s "womble",8,"right size");

diff --git a/test/mknod.t b/test/mknod.t
index 0edec86..c35853a 100644 (file)
--- a/test/mknod.t
+++ b/test/mknod.t
@@ -4,13 +4,14 @@ use Test::More;
 plan tests => 24;
 use English;
 use Unix::Mknod qw(:all);
-use Fcntl qw(:mode);
+use Fcntl qw(S_IFCHR S_IFBLK);
 use POSIX;
 
 my (@stat);
 
 chdir($_point);
-ok(!(system("touch reg"      )>>8),"create normal file");
+ok(open($file, '>', 'reg'),"create normal file");
+close($file);
 ok(defined mkfifo($_point.'/fifo', 0600),"create fifo");
 
 chdir($_real);

diff --git a/test/open.t b/test/open.t
index 030dc1f..b3afaf6 100644 (file)
--- a/test/open.t
+++ b/test/open.t
@@ -3,7 +3,9 @@ use test::helper qw($_real $_point);
 use Test::More;
 plan tests => 1;
 chdir($_real);
-system("echo frog >file");
+open($file, '>', 'file');
+print $file "frog\n";
+close($file);
 chdir($_point);
 ok(open(FILE,"file"),"open");
 close(FILE);

diff --git a/test/read.t b/test/read.t
index 5eca920..b4297f3 100644 (file)
--- a/test/read.t
+++ b/test/read.t
@@ -3,7 +3,9 @@ use test::helper qw($_real $_point);
 use Test::More;
 plan tests => 3;
 chdir($_real);
-system("echo frog >file");
+open($file, '>','file');
+print $file "frog\n";
+close($file);
 chdir($_point);
 ok(open(FILE,"file"),"open");
 my ($data) = <FILE>;

diff --git a/test/rename.t b/test/rename.t
index 9fbb330..e934173 100644 (file)
--- a/test/rename.t
+++ b/test/rename.t
@@ -3,7 +3,9 @@ use test::helper qw($_real $_point);
 use Test::More;
 plan tests => 5;
 chdir($_point);
-system("echo hippity >frog");
+open($file, '>', 'frog');
+print $file "hippity\n";
+close($file);
 ok(-f "frog","exists");
 ok(!-f "toad","target file doesn't exist");
 ok(rename("frog","toad"),"rename");

diff --git a/test/symlink.t b/test/symlink.t
index a17860f..f6c731e 100644 (file)
--- a/test/symlink.t
+++ b/test/symlink.t
@@ -14,8 +14,11 @@ unlink("def");
 # bug: doing a 'cp -a' on a directory which contains a symlink
 # reports an error
 mkdir("dira");
-system("cd dira; touch filea; ln -s filea fileb");
+open($file, '>', 'dira/filea');
+close($file);
+symlink('filea', 'dira/fileb');
 my $cp = 'cp -a';
 if ($^O eq 'netbsd') { $cp = 'cp -R'; }
 is(system($cp . " dira dirb")>>8,0,$cp);
-system("rm -rf dira dirb");
+map { unlink($_) } ('dira/filea', 'dira/fileb', 'dirb/filea', 'dirb/fileb');
+map { rmdir($_) } ('dira', 'dirb');

diff --git a/test/truncate.t b/test/truncate.t
index 8607421..0e9ceab 100644 (file)
--- a/test/truncate.t
+++ b/test/truncate.t
@@ -3,7 +3,9 @@ use test::helper qw($_real $_point);
 use Test::More;
 plan tests => 5;
 chdir($_point);
-system("echo hippity >womble");
+open($file, '>', 'womble');
+print $file "hippity\n";
+close($file);
 ok(-f "womble","exists");
 is(-s "womble",8,"right size");
 ok(truncate("womble",4),"truncate");

diff --git a/test/unlink.t b/test/unlink.t
index eef8c1a..85c255f 100644 (file)
--- a/test/unlink.t
+++ b/test/unlink.t
@@ -3,7 +3,8 @@ use test::helper qw($_real $_point);
 use Test::More;
 plan tests => 4;
 chdir($_point);
-system("touch file");
+open($file, '>', 'file');
+close($file);
 ok(-f "file","file exists");
 chdir($_real);
 ok(-f "file","file really exists");

diff --git a/test/utime.t b/test/utime.t
index 8ccefc6..e6bc7b8 100644 (file)
--- a/test/utime.t
+++ b/test/utime.t
@@ -4,7 +4,9 @@ use Test::More;
 plan tests => 3;
 my (@stat);
 chdir($_real);
-system("echo frog >file");
+open($file, '>', 'file');
+print($file "frog\n");
+close($file);
 chdir($_point);
 ok(utime(1,2,"file"),"set utime");
 @stat = stat("file");

diff --git a/test/write.t b/test/write.t
index 58af2aa..406a7e3 100644 (file)
--- a/test/write.t
+++ b/test/write.t
@@ -6,7 +6,9 @@ my ($data);
 chdir($_point);
 undef $/; # slurp it all
 # create file
-system("echo frogbing >writefile");
+open($file, '>', 'writefile');
+print $file "frogbing\n";
+close($file);
 
 # fetch contents of file
 ok(open(FILE,"writefile"),"open");