Author: ngie
Date: Sat Apr 22 23:27:40 2017
New Revision: 317308
URL: https://svnweb.freebsd.org/changeset/base/317308
Log:
gctl_test.t: more tweaks to try and update the code and get it functional
(again?)
- Make the logfile for $out be built off the basename for $cmd, instead of
$cmd.
(r317292 broke this assumption).
- Rename $mntpt to $mntpt_prefix for clarity, as this variable is a prefix for
mountpoints.
- Reindent the umount directive block while here to match the rest of the
code.
MFC after: 5 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/tools/regression/geom_gpt/gctl_test.t
Modified: head/tools/regression/geom_gpt/gctl_test.t
==============================================================================
--- head/tools/regression/geom_gpt/gctl_test.t Sat Apr 22 23:06:53 2017
(r317307)
+++ head/tools/regression/geom_gpt/gctl_test.t Sat Apr 22 23:27:40 2017
(r317308)
@@ -29,8 +29,10 @@
use strict;
use warnings;
+use File::Basename;
+
my $disk = "/tmp/disk-$$";
-my $mntpt = "/tmp/mount-$$";
+my $mntpt_prefix = "/tmp/mount-$$";
my %steps = (
"000" => "gctl",
@@ -137,7 +139,7 @@ if ($st != 0) {
}
chomp(my $cmd = `make '-V\${.OBJDIR}/\${PROG}'`);
-my $out = "/tmp/$cmd.out";
+my $out = basename($cmd) . ".out";
# Make sure we have permission to use gctl...
if (`$cmd` =~ "^FAIL Permission denied") {
@@ -192,14 +194,14 @@ foreach my $key (sort keys %steps) {
}
unlink $out;
} elsif ($action =~ "^mount") {
- system("mkdir $mntpt-$args");
+ system("mkdir $mntpt_prefix-$args");
system("newfs $args");
- system("mount -t ufs /dev/$args $mntpt-$args");
+ system("mount -t ufs /dev/$args $mntpt_prefix-$args");
print "ok $nr \# mount($key)\n";
} elsif ($action =~ "^umount") {
- system("umount $mntpt-$args");
- system("rmdir $mntpt-$args");
- print "ok $nr \# umount($key)\n";
+ system("umount $mntpt_prefix-$args");
+ system("rmdir $mntpt_prefix-$args");
+ print "ok $nr \# umount($key)\n";
}
$nr += 1;
}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
