From 9940eaaa17b17b1f4a106cd68130e27ec2832eca Mon Sep 17 00:00:00 2001
From: Enji Cooper <ngie@FreeBSD.org>
Date: Sat, 22 Apr 2017 23:27:40 +0000
Subject: [PATCH] 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
---
 tools/regression/geom_gpt/gctl_test.t | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/tools/regression/geom_gpt/gctl_test.t b/tools/regression/geom_gpt/gctl_test.t
index ab0810968cdf..f760fe04747c 100644
--- a/tools/regression/geom_gpt/gctl_test.t
+++ b/tools/regression/geom_gpt/gctl_test.t
@@ -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;
 }