From 0a079a986da879ed7a43fa5dd96aa366dac9388b Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Wed, 27 Mar 2002 21:23:06 +0000 Subject: [PATCH] Add another two alpha disks to this testcase. --- tools/regression/geom/Test/T013/ref.conf | 354 +++++++++++++++++++--- tools/regression/geom/Test/T013/testprg.c | 2 + 2 files changed, 319 insertions(+), 37 deletions(-) diff --git a/tools/regression/geom/Test/T013/ref.conf b/tools/regression/geom/Test/T013/ref.conf index 939145da4d74..1c47642975dc 100644 --- a/tools/regression/geom/Test/T013/ref.conf +++ b/tools/regression/geom/Test/T013/ref.conf @@ -1,86 +1,342 @@ $FreeBSD$ - 0x8072220 + 0x8072260 DEV-class - 0x80b9380 - 0x8072220 - da0c + 0x80be180 + 0x8072260 + da2c 3 - 0x80b8300 - 0x80b9380 - 0x80b8240 + 0x80b8a80 + 0x80be180 + 0x80b87c0 r0w0e0 - 0x80b9200 - 0x8072220 + 0x80be000 + 0x8072260 + da2b + 3 + + 0x80b8a40 + 0x80be000 + 0x80b8780 + r0w0e0 + + + + 0x80bce80 + 0x8072260 + da2a + 3 + + 0x80b8a00 + 0x80bce80 + 0x80b8740 + r0w0e0 + + + + 0x80bcd00 + 0x8072260 + da1f + 3 + + 0x80b89c0 + 0x80bcd00 + 0x80b8600 + r0w0e0 + + + + 0x80bcb80 + 0x8072260 + da1e + 3 + + 0x80b8980 + 0x80bcb80 + 0x80b85c0 + r0w0e0 + + + + 0x80bca00 + 0x8072260 + da1c + 3 + + 0x80b8940 + 0x80bca00 + 0x80b8580 + r0w0e0 + + + + 0x80bc880 + 0x8072260 + da1b + 3 + + 0x80b8900 + 0x80bc880 + 0x80b8540 + r0w0e0 + + + + 0x80bc700 + 0x8072260 + da1a + 3 + + 0x80b88c0 + 0x80bc700 + 0x80b8500 + r0w0e0 + + + + 0x80bc580 + 0x8072260 + da0c + 3 + + 0x80b8880 + 0x80bc580 + 0x80b83c0 + r0w0e0 + + + + 0x80bc400 + 0x8072260 da0b 3 - 0x80b82c0 - 0x80b9200 + 0x80b8840 + 0x80bc400 + 0x80b8380 + r0w0e0 + + + + 0x80bc380 + 0x8072260 + da0a + 3 + + 0x80b8800 + 0x80bc380 + 0x80b8340 + r0w0e0 + + + + 0x80b8640 + 0x8072260 + da2 + 2 + + 0x80b8680 + 0x80b8640 0x80b8200 r0w0e0 - 0x80b9180 - 0x8072220 - da0a - 3 + 0x80b8400 + 0x8072260 + da1 + 2 - 0x80b8280 - 0x80b9180 - 0x80b81c0 + 0x80b8440 + 0x80b8400 + 0x80b8140 r0w0e0 - 0x80b80c0 - 0x8072220 + 0x80b8240 + 0x8072260 da0 2 - 0x80b8100 - 0x80b80c0 + 0x80b8280 + 0x80b8240 0x80b8080 r0w0e0 - 0x80721e0 + 0x8072220 MBREXT-class - 0x80721a0 + 0x80721e0 MBR-class - 0x8072260 + 0x80722a0 BSD-class - 0x80b8140 - 0x8072260 + 0x80b86c0 + 0x80722a0 + da2 + 2 + + + + 0x80b8700 + 0x80b86c0 + 0x80b8200 + r0w0e0 + + + + + 0x80b87c0 + 0x80b86c0 + r0w0e0 + da2c + + 2 + 74027520 + 144585 + 0 + 0 + + + + 0x80b8780 + 0x80b86c0 + r0w0e0 + da2b + + 1 + 4178442240 + 8161020 + 2194844813312 + 4286806276 + + + + 0x80b8740 + 0x80b86c0 + r0w0e0 + da2a + + 0 + 24675840 + 48195 + 2194820137472 + 4286758081 + + + + + 0x80b8480 + 0x80722a0 + da1 + 2 + + + + 0x80b84c0 + 0x80b8480 + 0x80b8140 + r0w0e0 + + + + + 0x80b8600 + 0x80b8480 + r0w0e0 + da1f + + 5 + 16951073792 + 33107566 + 1358921728 + 2654144 + + + + 0x80b85c0 + 0x80b8480 + r0w0e0 + da1e + + 4 + 20971520 + 40960 + 1337950208 + 2613184 + + + + 0x80b8580 + 0x80b8480 + r0w0e0 + da1c + + 2 + 18309995520 + 35761710 + 0 + 0 + + + + 0x80b8540 + 0x80b8480 + r0w0e0 + da1b + + 1 + 1086291968 + 2121664 + 251658240 + 491520 + + + + 0x80b8500 + 0x80b8480 + r0w0e0 + da1a + + 0 + 251658240 + 491520 + 0 + 0 + + + + + 0x80b82c0 + 0x80722a0 da0 2 - 0x80b8180 - 0x80b8140 + 0x80b8300 + 0x80b82c0 0x80b8080 r0w0e0 - 0x80b8240 - 0x80b8140 + 0x80b83c0 + 0x80b82c0 r0w0e0 da0c @@ -92,8 +348,8 @@ - 0x80b8200 - 0x80b8140 + 0x80b8380 + 0x80b82c0 r0w0e0 da0b @@ -105,8 +361,8 @@ - 0x80b81c0 - 0x80b8140 + 0x80b8340 + 0x80b82c0 r0w0e0 da0a @@ -120,11 +376,35 @@ - 0x80720e0 + 0x8072120 SIMDISK-class + + 0x80b81c0 + 0x8072120 + da2 + 1 + + 0x80b8200 + 0x80b81c0 + r0w0e0 + da2 + + + + 0x80b8100 + 0x8072120 + da1 + 1 + + 0x80b8140 + 0x80b8100 + r0w0e0 + da1 + + 0x80b8040 - 0x80720e0 + 0x8072120 da0 1 diff --git a/tools/regression/geom/Test/T013/testprg.c b/tools/regression/geom/Test/T013/testprg.c index ce91b5e5a7e9..aebd9d935149 100644 --- a/tools/regression/geom/Test/T013/testprg.c +++ b/tools/regression/geom/Test/T013/testprg.c @@ -61,6 +61,8 @@ thread_sim(void *ptr __unused) g_simdisk_xml_load("da0", "../../Data/disk.beast.da0.xml"); + g_simdisk_xml_load("da1", "../../Data/disk.alpha.da0.xml"); + g_simdisk_xml_load("da2", "../../Data/disk.alpha2.da0.xml"); rattle(); conff("1"); printf("Done\n");