MFp4:

o  Add mount and umount actions so that partitions can be in use.
o  Extend the testing of the add verb to include overlapping
   partitions.
o  Add tests for the remove verb. this includes tests to remove
   a partition when in use (i.e. is mounted).
o  Add a MD5 checksum to the output of the conf action so that
   it can be tested. Make sure the MD5 doesn't vary based on
   certain dynamic behaviour that is irrelevant to the output.
o  Add MD5 checksums to the expected result of conf actions.

1 files changed, 70 insertions, 16 deletions

diff --git a/tools/regression/geom_gpt/gctl.t b/tools/regression/geom_gpt/gctl.t
index 8241ed8..f99e6d8 100644
--- a/tools/regression/geom_gpt/gctl.t
+++ b/tools/regression/geom_gpt/gctl.t
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl -w
 #
-# Copyright (c) 2005 Marcel Moolenaar
+# Copyright (c) 2005, 2006 Marcel Moolenaar
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -32,6 +32,7 @@ chomp $srcdir;
 my $cmd = "/tmp/gctl-$$";
 my $out = "$cmd.out";
 my $disk = "/tmp/disk-$$";
+my $mntpt = "/tmp/mount-$$";
 
 my %steps = (
     "000" => "gctl",
@@ -42,7 +43,7 @@ my %steps = (
     "021" => "gctl verb=create provider=%dev% entries=-1",
     "022" => "gctl verb=create provider=%dev% entries=128",
     "023" => "gctl verb=create provider=%dev%",
-    "024" => "gctl verb=bogus geom=%dev%",
+    "024" => "gctl verb=modify geom=%dev%",
     "025" => "conf",
     "030" => "gctl verb=add",
     "031" => "gctl verb=add geom=bogus",
@@ -52,8 +53,27 @@ my %steps = (
     "035" => "gctl verb=add geom=%dev% type=ed0101b0-2a71-11da-ba81-003048416ace start=1",
     "036" => "gctl verb=add geom=%dev% type=ed0101b0-2a71-11da-ba81-003048416ace start=34",
     "037" => "gctl verb=add geom=%dev% type=ed0101b0-2a71-11da-ba81-003048416ace start=34 end=12345678",
-    "038" => "gctl verb=add geom=%dev% type=ed0101b0-2a71-11da-ba81-003048416ace start=34 end=546",
-    "039" => "conf",
+    "038" => "gctl verb=add geom=%dev% type=ed0101b0-2a71-11da-ba81-003048416ace start=162 end=417 entry=129",
+    "039" => "gctl verb=add geom=%dev% type=ed0101b0-2a71-11da-ba81-003048416ace start=162 end=417 entry:8=5",
+    "040" => "gctl verb=add geom=%dev% type=83d34ed5-c4ff-11da-b65b-000347c5d7f3 start=34 end=161 entry=5",
+    "041" => "gctl verb=add geom=%dev% type=83d34ed5-c4ff-11da-b65b-000347c5d7f3 start=34 end=546",
+    "042" => "gctl verb=add geom=%dev% type=83d34ed5-c4ff-11da-b65b-000347c5d7f3 start=162 end=417",
+    "043" => "gctl verb=add geom=%dev% type=83d34ed5-c4ff-11da-b65b-000347c5d7f3 start=100 end=300",
+    "044" => "gctl verb=add geom=%dev% type=83d34ed5-c4ff-11da-b65b-000347c5d7f3 start=300 end=500",
+    "045" => "gctl verb=add geom=%dev% type=83d34ed5-c4ff-11da-b65b-000347c5d7f3 start=34 end=161 entry:8",
+    "046" => "gctl verb=add geom=%dev% type=d2bd4509-c4ff-11da-b4cc-00306e39b62f start=418 end=546 entry:8",
+    "047" => "conf",
+    "050" => "gctl verb=remove geom=%dev% entry=5",
+    "051" => "gctl verb=remove geom=%dev% entry=2",
+    "052" => "gctl verb=remove geom=%dev% entry=1",
+    "053" => "gctl verb=remove geom=%dev% entry=1",
+    "054" => "conf",
+    "060" => "gctl verb=add geom=%dev% type=516e7cb6-6ecf-11d6-8ff8-00022d09712b start=34 end=546 entry:8=1",
+    "061" => "mount %dev%p1",
+    "062" => "gctl verb=remove geom=%dev% entry=1",
+    "063" => "umount %dev%p1",
+    "064" => "gctl verb=remove geom=%dev% entry=1",
+    "065" => "conf",
     "100" => "mdcfg destroy",
     "110" => "mdcfg create corrupted",
     "111" => "gctl verb=add geom=%dev%",
@@ -62,15 +82,15 @@ my %steps = (
 
 my %result = (
     "000" => "FAIL Verb missing",
-    "001" => "FAIL 87 geom",
+    "001" => "FAIL 22 verb 'bogus'",
     "010" => "FAIL 87 provider",
     "011" => "FAIL 22 provider 'bogus'",
     "020" => "",
     "021" => "FAIL 22 entries -1",
     "022" => "PASS",
     "023" => "FAIL 17 geom '%dev%'",
-    "024" => "FAIL 22 verb 'bogus'",
-    "025" => "",
+    "024" => "FAIL 87 entry",
+    "025" => "b1856477950e5786898c8f01361196cf",
     "030" => "FAIL 87 geom",
     "031" => "FAIL 22 geom 'bogus'",
     "032" => "FAIL 87 type",
@@ -79,8 +99,27 @@ my %result = (
     "035" => "FAIL 22 start 1",
     "036" => "FAIL 87 end",
     "037" => "FAIL 22 end 12345678",
-    "038" => "PASS",
-    "039" => "",
+    "038" => "FAIL 22 entry 129",
+    "039" => "PASS entry=5",
+    "040" => "FAIL 17 entry 5",
+    "041" => "FAIL 28 start/end 34/546",
+    "042" => "FAIL 28 start/end 162/417",
+    "043" => "FAIL 28 start/end 100/300",
+    "044" => "FAIL 28 start/end 300/500",
+    "045" => "PASS entry=1",
+    "046" => "PASS entry=2",
+    "047" => "50783a39eecfc62a29db24381e12b9d8",
+    "050" => "PASS",
+    "051" => "PASS",
+    "052" => "PASS",
+    "053" => "FAIL 2 entry 1",
+    "054" => "b1856477950e5786898c8f01361196cf",
+    "060" => "PASS",
+    "061" => "PASS",
+    "062" => "FAIL 16",
+    "063" => "PASS",
+    "064" => "PASS",
+    "065" => "b1856477950e5786898c8f01361196cf",
     "100" => "",
     "110" => "",
     "111" => "FAIL 6 geom '%dev%'",
@@ -118,7 +157,7 @@ foreach my $key (sort keys %steps) {
     $args =~ s/%dev%/$dev/g;
     $res =~ s/%dev%/$dev/g;
 
-    if ($action =~ "gctl") {
+    if ($action =~ "^gctl") {
 	system("$cmd $verbose $args | tee $out 2>&1");
 	$st = `tail -1 $out`;
 	if ($st =~ "^$res") {
@@ -127,24 +166,39 @@ foreach my $key (sort keys %steps) {
 	    print "not ok $nr \# gctl($key) - $st\n";
 	}
 	unlink $out;
-    } elsif ($action =~ "mdcfg") {
-	if ($args =~ "create") {
+    } elsif ($action =~ "^mdcfg") {
+	if ($args =~ "^create") {
 	    system("dd if=/dev/zero of=$disk count=1024 2>&1");
 	    if ($args =~ "corrupted") {
 		system("gpt create -p $disk");
 	    }
 	    $dev = `mdconfig -a -t vnode -f $disk`;
 	    chomp $dev;
-	} elsif ($args =~ "destroy") {
+	} elsif ($args =~ "^destroy") {
 	    $dev =~ s/md/-u /g;
 	    system("mdconfig -d $dev");
 	    unlink $disk;
 	    $dev = "n/a";
 	}
 	print "ok $nr \# mdcfg($key)\n";
-    } elsif ($action =~ "conf") {
-	system("sysctl -b kern.geom.conftxt | grep -a $dev");
-	print "ok $nr \# conf($key)\n";
+    } 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`;
+	if ($st =~ "^$res") {
+	    print "ok $nr \# conf($key)\n";
+	} else {
+	    print "not ok $nr \# conf($key) - $st\n";
+	}
+	unlink $out;
+    } elsif ($action =~ "^mount") {
+	    system("mkdir $mntpt-$args");
+	    system("newfs $args");
+	    system("mount -t ufs /dev/$args $mntpt-$args");
+	    print "ok $nr \# mount($key)\n";
+    } elsif ($action =~ "^umount") {
+	    system("umount $mntpt-$args");
+	    system("rmdir $mntpt-$args");
+	    print "ok $nr \# umount($key)\n";
     }
     $nr += 1;
 }