svn commit: r319800 - head/tools/regression/geom_gpt
Ngie Cooper
ngie at FreeBSD.org
Sat Jun 10 19:48:47 UTC 2017
Author: ngie
Date: Sat Jun 10 19:48:45 2017
New Revision: 319800
URL: https://svnweb.freebsd.org/changeset/base/319800
Log:
Don't explicitly get the class to PART in gctl_test_helper.c
This will allow the tool to be used with arbitrary geom(4) classes, like GEOM.
Specify class=PART explicitly in the tester to keep existing behavior.
MFC after: 1 month
Sponsored by: Dell EMC Isilon
Modified:
head/tools/regression/geom_gpt/gctl_test.t
head/tools/regression/geom_gpt/gctl_test_helper.c
Modified: head/tools/regression/geom_gpt/gctl_test.t
==============================================================================
--- head/tools/regression/geom_gpt/gctl_test.t Sat Jun 10 19:17:14 2017 (r319799)
+++ head/tools/regression/geom_gpt/gctl_test.t Sat Jun 10 19:48:45 2017 (r319800)
@@ -35,48 +35,48 @@ my $disk = "/tmp/disk-$$";
my $mntpt_prefix = "/tmp/mount-$$";
my %steps = (
- "000" => "gctl",
- "001" => "gctl verb=bogus",
- "010" => "gctl verb=create",
- "011" => "gctl verb=create provider=bogus",
+ "000" => "gctl class=PART",
+ "001" => "gctl class=PART verb=bogus",
+ "010" => "gctl class=PART verb=create",
+ "011" => "gctl class=PART verb=create provider=bogus",
"020" => "mdcfg create pristine",
- "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=modify geom=%dev%",
+ "021" => "gctl class=PART verb=create provider=%dev% entries=-1",
+ "022" => "gctl class=PART verb=create provider=%dev% entries=128",
+ "023" => "gctl class=PART verb=create provider=%dev%",
+ "024" => "gctl class=PART verb=modify geom=%dev%",
"025" => "conf",
- "030" => "gctl verb=add",
- "031" => "gctl verb=add geom=bogus",
- "032" => "gctl verb=add geom=%dev%",
- "033" => "gctl verb=add geom=%dev% type=bogus",
- "034" => "gctl verb=add geom=%dev% type=ed0101b0-2a71-11da-ba81-003048416ace",
- "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=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",
+ "030" => "gctl class=PART verb=add",
+ "031" => "gctl class=PART verb=add geom=bogus",
+ "032" => "gctl class=PART verb=add geom=%dev%",
+ "033" => "gctl class=PART verb=add geom=%dev% type=bogus",
+ "034" => "gctl class=PART verb=add geom=%dev% type=ed0101b0-2a71-11da-ba81-003048416ace",
+ "035" => "gctl class=PART verb=add geom=%dev% type=ed0101b0-2a71-11da-ba81-003048416ace start=1",
+ "036" => "gctl class=PART verb=add geom=%dev% type=ed0101b0-2a71-11da-ba81-003048416ace start=34",
+ "037" => "gctl class=PART verb=add geom=%dev% type=ed0101b0-2a71-11da-ba81-003048416ace start=34 end=12345678",
+ "038" => "gctl class=PART verb=add geom=%dev% type=ed0101b0-2a71-11da-ba81-003048416ace start=162 end=417 entry=129",
+ "039" => "gctl class=PART verb=add geom=%dev% type=ed0101b0-2a71-11da-ba81-003048416ace start=162 end=417 entry:8=5",
+ "040" => "gctl class=PART verb=add geom=%dev% type=83d34ed5-c4ff-11da-b65b-000347c5d7f3 start=34 end=161 entry=5",
+ "041" => "gctl class=PART verb=add geom=%dev% type=83d34ed5-c4ff-11da-b65b-000347c5d7f3 start=34 end=546",
+ "042" => "gctl class=PART verb=add geom=%dev% type=83d34ed5-c4ff-11da-b65b-000347c5d7f3 start=162 end=417",
+ "043" => "gctl class=PART verb=add geom=%dev% type=83d34ed5-c4ff-11da-b65b-000347c5d7f3 start=100 end=300",
+ "044" => "gctl class=PART verb=add geom=%dev% type=83d34ed5-c4ff-11da-b65b-000347c5d7f3 start=300 end=500",
+ "045" => "gctl class=PART verb=add geom=%dev% type=83d34ed5-c4ff-11da-b65b-000347c5d7f3 start=34 end=161 entry:8",
+ "046" => "gctl class=PART 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",
+ "050" => "gctl class=PART verb=remove geom=%dev% entry=5",
+ "051" => "gctl class=PART verb=remove geom=%dev% entry=2",
+ "052" => "gctl class=PART verb=remove geom=%dev% entry=1",
+ "053" => "gctl class=PART 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",
+ "060" => "gctl class=PART verb=add geom=%dev% type=516e7cb6-6ecf-11d6-8ff8-00022d09712b start=34 end=546 entry:8=1",
"061" => "mount %dev%p1",
- "062" => "gctl verb=delete geom=%dev% entry=1",
+ "062" => "gctl class=PART verb=delete geom=%dev% entry=1",
"063" => "umount %dev%p1",
- "064" => "gctl verb=delete geom=%dev% entry=1",
+ "064" => "gctl class=PART verb=delete geom=%dev% entry=1",
"065" => "conf",
"100" => "mdcfg destroy",
"110" => "mdcfg create corrupted",
- "111" => "gctl verb=add geom=%dev%",
+ "111" => "gctl class=PART verb=add geom=%dev%",
"120" => "mdcfg destroy",
);
Modified: head/tools/regression/geom_gpt/gctl_test_helper.c
==============================================================================
--- head/tools/regression/geom_gpt/gctl_test_helper.c Sat Jun 10 19:17:14 2017 (r319799)
+++ head/tools/regression/geom_gpt/gctl_test_helper.c Sat Jun 10 19:48:45 2017 (r319800)
@@ -117,7 +117,6 @@ main(int argc, char *argv[])
req = gctl_get_handle();
assert(req != NULL);
- gctl_ro_param(req, "class", -1, "PART");
while ((c = getopt(argc, argv, "v")) != -1) {
switch (c) {
More information about the svn-src-head
mailing list