diff options
author | Enji Cooper <ngie@FreeBSD.org> | 2017-04-23 02:30:06 +0000 |
---|---|---|
committer | Enji Cooper <ngie@FreeBSD.org> | 2017-04-23 02:30:06 +0000 |
commit | 67b1f73f1ec2189a7d8f4a7c475a01a4e1288e5c (patch) | |
tree | f0ee88aaaa4bbc15511f81c50a18d931cb58543d /tools/regression | |
parent | 3bacccb6f19f8386a0f773783f127fa2241d5354 (diff) | |
download | src-test-67b1f73f1ec2189a7d8f4a7c475a01a4e1288e5c.tar.gz src-test-67b1f73f1ec2189a7d8f4a7c475a01a4e1288e5c.zip |
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.
MFC after: 5 weeks
Sponsored by: Dell EMC Isilon
Notes
Notes:
svn path=/head/; revision=317313
Diffstat (limited to 'tools/regression')
-rw-r--r-- | tools/regression/geom_gpt/gctl_test.t | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/tools/regression/geom_gpt/gctl_test.t b/tools/regression/geom_gpt/gctl_test.t index 4161b968d22bc..38469843c7b9b 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`; |