From 2cdf0f22f9a1804d324cc147adc5933f5ded14d9 Mon Sep 17 00:00:00 2001
From: ngie <ngie@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Mon, 29 May 2017 18:20:29 +0000
Subject: [PATCH] MFC r317313:

gctl_test.t: catch errors with the mdcfg directive

While here, add a note about certain testcases relying on `count=1024` in
the "create" portion.


git-svn-id: svn://svn.freebsd.org/base/stable/10@319154 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 tools/regression/geom_gpt/gctl_test.t | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/tools/regression/geom_gpt/gctl_test.t b/tools/regression/geom_gpt/gctl_test.t
index 4161b968d..38469843c 100644
--- a/tools/regression/geom_gpt/gctl_test.t
+++ b/tools/regression/geom_gpt/gctl_test.t
@@ -172,20 +172,32 @@ foreach my $key (sort keys %steps) {
 	    ($errmsg eq "" ? "" : " - $errmsg"));
 	unlink $out;
     } elsif ($action =~ "^mdcfg") {
+	my $errmsg = "";
 	if ($args =~ "^create") {
-	    system("dd if=/dev/zero of=$disk count=1024 2>&1");
-	    if ($args =~ "corrupted") {
-		system("gpt create -p $disk");
+	    # NOTE: `count=1024` affects $key => {"025" "054", "065"}.
+	    if (system("dd if=/dev/zero of=$disk count=1024 2>&1") == 0) {
+		chomp($dev = `mdconfig -a -t vnode -f $disk`);
+		if ($? == 0) {
+		    if (system("gpart create -s GPT $dev") != 0) {
+			$errmsg = "gpart create failed";
+		    }
+		} else {
+		    $errmsg = "mdconfig -a failed";
+		}
+	    } else {
+		$errmsg = "dd failed";
 	    }
-	    $dev = `mdconfig -a -t vnode -f $disk`;
-	    chomp $dev;
 	} elsif ($args =~ "^destroy") {
 	    $dev =~ s/md/-u /g;
-	    system("mdconfig -d $dev");
+	    if (system("mdconfig -d $dev") != 0) {
+		$errmsg = "mdconfig -d failed";
+	    }
 	    unlink $disk;
 	    $dev = "n/a";
 	}
-	print "ok $nr \# mdcfg($key)\n";
+	printf("%sok $nr # mdcfg($key)%s\n",
+	    ($errmsg eq "" ? "" : "not "),
+	    ($errmsg eq "" ? "" : " - $errmsg"));
     } elsif ($action =~ "^conf") {
 	system("sysctl -b kern.geom.conftxt | grep -a $dev | sed -e s:$disk:DISK:g -e s:$dev:DEV:g | sort | md5 -p | tee $out 2>&1");
 	$st = `tail -1 $out`;
-- 
2.45.0