From 5539ba0c476726fe20afa71776407356d9b9e241 Mon Sep 17 00:00:00 2001 From: ngie Date: Mon, 16 Nov 2015 07:03:00 +0000 Subject: MFhead @ r290922 --- tools/regression/acct/Makefile | 22 -------- tools/regression/acct/pack.c | 108 ---------------------------------------- tools/regression/acct/regress.t | 39 --------------- 3 files changed, 169 deletions(-) delete mode 100644 tools/regression/acct/Makefile delete mode 100644 tools/regression/acct/pack.c delete mode 100755 tools/regression/acct/regress.t (limited to 'tools/regression') diff --git a/tools/regression/acct/Makefile b/tools/regression/acct/Makefile deleted file mode 100644 index 581cc5f..0000000 --- a/tools/regression/acct/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# -# $FreeBSD$ -# -# "make" will compile the acct test programs -# - -PROG= pack -SRCS= pack.c -MAN= -CFLAGS+= -I${.OBJDIR} - -pack.o: convert.c - -CLEANFILES+= convert.c -convert.c: ../../../sys/kern/kern_acct.c - sed -n -e 's/log(/syslog(/g' \ - -e '/FLOAT_CONVERSION_START/,/FLOAT_CONVERSION_END/p' $? >$@ - -regress: pack regress.t - ${.CURDIR}/regress.t - -.include diff --git a/tools/regression/acct/pack.c b/tools/regression/acct/pack.c deleted file mode 100644 index d1d3085..0000000 --- a/tools/regression/acct/pack.c +++ /dev/null @@ -1,108 +0,0 @@ -/*- - * Copyright (c) 2007 Diomidis Spinellis. All rights reserved. - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -__FBSDID("$FreeBSD$"); - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define KASSERT(val, msg) assert(val) - -typedef u_int32_t comp_t; - -#define AHZ 1000000 - -#include "convert.c" - -static int nerr; - -union cf { - comp_t c; - float f; -}; - -static void -check_result(const char *name, float expected, union cf v) -{ - double eps; - - eps = fabs(expected - v.f) / expected; - if (eps > FLT_EPSILON) { - printf("Error in %s\n", name); - printf("Got 0x%08x %12g\n", v.c, v.f); - v.f = expected; - printf("Expected 0x%08x %12g (%.15lg)\n", v.c, v.f, expected); - printf("Epsilon=%lg, rather than %g\n", eps, FLT_EPSILON); - nerr++; - } -} - -int -main(int argc, char *argv[]) -{ - union cf v; - long l; - int i, end; - struct timeval tv; - - if (argc == 2) { - /* Loop test */ - end = atoi(argv[1]); - for (i = 0; i < end; i++) { - tv.tv_sec = random(); - tv.tv_usec = (random() % 1000000); - v.c = encode_timeval(tv); - check_result("encode_timeval", - (float)tv.tv_sec * AHZ + tv.tv_usec, v); - l = random(); - v.c = encode_long(l); - check_result("encode_long", l, v); - } - } else if (argc == 3) { - /* Single-value timeval/long test */ - tv.tv_sec = atol(argv[1]); - tv.tv_usec = atol(argv[2]); - v.c = encode_timeval(tv); - check_result("encode_timeval", - (float)tv.tv_sec * AHZ + tv.tv_usec, v); - v.c = encode_long(tv.tv_sec); - check_result("encode_long", tv.tv_sec, v); - } else { - fprintf(stderr, "usage:\n%s repetitions\n%s sec usec\n", - argv[0], argv[0]); - return (1); - } - return (nerr); -} diff --git a/tools/regression/acct/regress.t b/tools/regression/acct/regress.t deleted file mode 100755 index 3f63c3a..0000000 --- a/tools/regression/acct/regress.t +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -if test -z "${DIR}" ; then - DIR=$( make -V .OBJDIR ) -fi -if test -z "${DIR}" ; then - DIR=$( dirname $0 ) -fi - -check() -{ - NUM=$1 - shift - if $DIR/pack $* - then - echo "ok $NUM" - else - echo "not ok $NUM" - fi -} - -(cd $DIR ; make pack) >/dev/null 2>&1 - -echo 1..7 - -check 1 0 0 -check 2 0 1 -check 3 1 0 -check 4 1 999999 -check 5 1 1000000 -check 6 2147483647 999999 -check 7 10000000 - -(cd $DIR ; make clean) >/dev/null 2>&1 - -exit 0 -- cgit v1.1 From 2a27bc575c82aa6bbac7094fb9cffd00aed7fe62 Mon Sep 17 00:00:00 2001 From: ngie Date: Mon, 16 Nov 2015 08:58:03 +0000 Subject: Integrate tools/regression/geom* into the FreeBSD test suite under sbin/geom/... XXX: test --- tools/regression/geom/ConfCmp/ConfCmp.c | 377 ----------------- tools/regression/geom/ConfCmp/Makefile | 35 -- tools/regression/geom/ConfCmp/a1.conf | 414 ------------------ tools/regression/geom/ConfCmp/a1a.conf | 414 ------------------ tools/regression/geom/ConfCmp/a1b.conf | 414 ------------------ tools/regression/geom/ConfCmp/a1c.conf | 414 ------------------ tools/regression/geom/ConfCmp/a1d.conf | 414 ------------------ tools/regression/geom/ConfCmp/a2.conf | 207 --------- tools/regression/geom/ConfCmp/a2a.conf | 207 --------- tools/regression/geom/ConfCmp/a2b.conf | 207 --------- tools/regression/geom/ConfCmp/a2c.conf | 206 --------- tools/regression/geom/ConfCmp/a2d.conf | 211 ---------- tools/regression/geom/Data/disk.alpha.da0.xml | 33 -- tools/regression/geom/Data/disk.alpha2.da0.xml | 33 -- tools/regression/geom/Data/disk.apple.xml | 93 ----- tools/regression/geom/Data/disk.beast.da0.xml | 33 -- tools/regression/geom/Data/disk.critter.ad0.xml | 178 -------- tools/regression/geom/Data/disk.empty.flp.xml | 12 - tools/regression/geom/Data/disk.far.ad0.xml | 51 --- tools/regression/geom/Data/disk.flat.da1.xml | 97 ----- tools/regression/geom/Data/disk.kern.flp.xml | 51 --- tools/regression/geom/Data/disk.msdos.ext.xml | 534 ------------------------ tools/regression/geom/Data/disk.msdos.flp.xml | 51 --- tools/regression/geom/Data/disk.pc98.wdc0.xml | 75 ---- tools/regression/geom/Data/disk.sun.da0.xml | 33 -- tools/regression/geom/Data/disk.sun.da1.xml | 33 -- tools/regression/geom/Data/disk.typo.ad0.xml | 219 ---------- tools/regression/geom/MdLoad/Makefile | 14 - tools/regression/geom/MdLoad/MdLoad.c | 271 ------------ tools/regression/geom/Ref/disk.alpha.da0.xml | 7 - tools/regression/geom/Ref/disk.alpha2.da0.xml | 5 - tools/regression/geom/Ref/disk.apple.xml | 5 - tools/regression/geom/Ref/disk.beast.da0.xml | 5 - tools/regression/geom/Ref/disk.critter.ad0.xml | 11 - tools/regression/geom/Ref/disk.empty.flp.xml | 2 - tools/regression/geom/Ref/disk.far.ad0.xml | 4 - tools/regression/geom/Ref/disk.flat.da1.xml | 12 - tools/regression/geom/Ref/disk.kern.flp.xml | 5 - tools/regression/geom/Ref/disk.msdos.ext.xml | 27 -- tools/regression/geom/Ref/disk.msdos.flp.xml | 2 - tools/regression/geom/Ref/disk.pc98.wdc0.xml | 8 - tools/regression/geom/Ref/disk.sun.da0.xml | 6 - tools/regression/geom/Ref/disk.sun.da1.xml | 9 - tools/regression/geom/Ref/disk.typo.ad0.xml | 14 - tools/regression/geom/RunTest.sh | 44 -- tools/regression/geom/RunTest.t | 50 --- tools/regression/geom_concat/conf.sh | 8 - tools/regression/geom_concat/test-1.t | 30 -- tools/regression/geom_concat/test-2.t | 35 -- tools/regression/geom_eli/attach-d.t | 38 -- tools/regression/geom_eli/configure-b-B.t | 130 ------ tools/regression/geom_eli/delkey.t | 140 ------- tools/regression/geom_eli/detach-l.t | 44 -- tools/regression/geom_eli/init-B.t | 106 ----- tools/regression/geom_eli/init-J.t | 126 ------ tools/regression/geom_eli/init-a.t | 59 --- tools/regression/geom_eli/init-i-P.t | 22 - tools/regression/geom_eli/init.t | 64 --- tools/regression/geom_eli/integrity-copy.t | 98 ----- tools/regression/geom_eli/integrity-data.t | 68 --- tools/regression/geom_eli/integrity-hmac.t | 68 --- tools/regression/geom_eli/kill.t | 97 ----- tools/regression/geom_eli/nokey.t | 65 --- tools/regression/geom_eli/onetime-a.t | 53 --- tools/regression/geom_eli/onetime-d.t | 33 -- tools/regression/geom_eli/onetime.t | 58 --- tools/regression/geom_eli/readonly.t | 93 ----- tools/regression/geom_eli/resize.t | 150 ------- tools/regression/geom_eli/setkey.t | 156 ------- tools/regression/geom_gate/Makefile | 8 - tools/regression/geom_gate/runtests.sh | 8 - tools/regression/geom_gate/test-1.sh | 36 -- tools/regression/geom_gate/test-1.t | 40 -- tools/regression/geom_gate/test-2.sh | 28 -- tools/regression/geom_gate/test-2.t | 31 -- tools/regression/geom_gate/test-3.sh | 31 -- tools/regression/geom_gate/test-3.t | 34 -- tools/regression/geom_gpt/gctl.t | 207 --------- tools/regression/geom_gpt/test.c | 165 -------- tools/regression/geom_mirror/conf.sh | 8 - tools/regression/geom_mirror/test-1.t | 34 -- tools/regression/geom_mirror/test-2.t | 59 --- tools/regression/geom_mirror/test-3.t | 70 ---- tools/regression/geom_mirror/test-4.t | 70 ---- tools/regression/geom_mirror/test-5.t | 70 ---- tools/regression/geom_mirror/test-6.t | 52 --- tools/regression/geom_mirror/test-7.t | 70 ---- tools/regression/geom_nop/conf.sh | 7 - tools/regression/geom_nop/test-1.t | 25 -- tools/regression/geom_nop/test-2.t | 29 -- tools/regression/geom_raid3/conf.sh | 8 - tools/regression/geom_raid3/test-1.t | 37 -- tools/regression/geom_raid3/test-10.t | 39 -- tools/regression/geom_raid3/test-11.t | 39 -- tools/regression/geom_raid3/test-12.t | 46 -- tools/regression/geom_raid3/test-2.t | 39 -- tools/regression/geom_raid3/test-3.t | 43 -- tools/regression/geom_raid3/test-4.t | 43 -- tools/regression/geom_raid3/test-5.t | 43 -- tools/regression/geom_raid3/test-6.t | 47 --- tools/regression/geom_raid3/test-7.t | 50 --- tools/regression/geom_raid3/test-8.t | 46 -- tools/regression/geom_raid3/test-9.t | 49 --- tools/regression/geom_shsec/conf.sh | 8 - tools/regression/geom_shsec/test-1.t | 37 -- tools/regression/geom_shsec/test-2.t | 59 --- tools/regression/geom_stripe/conf.sh | 8 - tools/regression/geom_stripe/test-1.t | 30 -- tools/regression/geom_stripe/test-2.t | 35 -- tools/regression/geom_subr.sh | 14 - tools/regression/geom_uzip/Makefile | 23 - tools/regression/geom_uzip/etalon/etalon.txt | 43 -- tools/regression/geom_uzip/runtests.sh | 10 - tools/regression/geom_uzip/test-1.img.uzip.uue | 110 ----- tools/regression/geom_uzip/test-1.sh | 36 -- tools/regression/geom_uzip/test-2.sh | 15 - 116 files changed, 9327 deletions(-) delete mode 100644 tools/regression/geom/ConfCmp/ConfCmp.c delete mode 100644 tools/regression/geom/ConfCmp/Makefile delete mode 100644 tools/regression/geom/ConfCmp/a1.conf delete mode 100644 tools/regression/geom/ConfCmp/a1a.conf delete mode 100644 tools/regression/geom/ConfCmp/a1b.conf delete mode 100644 tools/regression/geom/ConfCmp/a1c.conf delete mode 100644 tools/regression/geom/ConfCmp/a1d.conf delete mode 100644 tools/regression/geom/ConfCmp/a2.conf delete mode 100644 tools/regression/geom/ConfCmp/a2a.conf delete mode 100644 tools/regression/geom/ConfCmp/a2b.conf delete mode 100644 tools/regression/geom/ConfCmp/a2c.conf delete mode 100644 tools/regression/geom/ConfCmp/a2d.conf delete mode 100644 tools/regression/geom/Data/disk.alpha.da0.xml delete mode 100644 tools/regression/geom/Data/disk.alpha2.da0.xml delete mode 100644 tools/regression/geom/Data/disk.apple.xml delete mode 100644 tools/regression/geom/Data/disk.beast.da0.xml delete mode 100644 tools/regression/geom/Data/disk.critter.ad0.xml delete mode 100644 tools/regression/geom/Data/disk.empty.flp.xml delete mode 100644 tools/regression/geom/Data/disk.far.ad0.xml delete mode 100644 tools/regression/geom/Data/disk.flat.da1.xml delete mode 100644 tools/regression/geom/Data/disk.kern.flp.xml delete mode 100644 tools/regression/geom/Data/disk.msdos.ext.xml delete mode 100644 tools/regression/geom/Data/disk.msdos.flp.xml delete mode 100644 tools/regression/geom/Data/disk.pc98.wdc0.xml delete mode 100644 tools/regression/geom/Data/disk.sun.da0.xml delete mode 100644 tools/regression/geom/Data/disk.sun.da1.xml delete mode 100644 tools/regression/geom/Data/disk.typo.ad0.xml delete mode 100644 tools/regression/geom/MdLoad/Makefile delete mode 100644 tools/regression/geom/MdLoad/MdLoad.c delete mode 100644 tools/regression/geom/Ref/disk.alpha.da0.xml delete mode 100644 tools/regression/geom/Ref/disk.alpha2.da0.xml delete mode 100644 tools/regression/geom/Ref/disk.apple.xml delete mode 100644 tools/regression/geom/Ref/disk.beast.da0.xml delete mode 100644 tools/regression/geom/Ref/disk.critter.ad0.xml delete mode 100644 tools/regression/geom/Ref/disk.empty.flp.xml delete mode 100644 tools/regression/geom/Ref/disk.far.ad0.xml delete mode 100644 tools/regression/geom/Ref/disk.flat.da1.xml delete mode 100644 tools/regression/geom/Ref/disk.kern.flp.xml delete mode 100644 tools/regression/geom/Ref/disk.msdos.ext.xml delete mode 100644 tools/regression/geom/Ref/disk.msdos.flp.xml delete mode 100644 tools/regression/geom/Ref/disk.pc98.wdc0.xml delete mode 100644 tools/regression/geom/Ref/disk.sun.da0.xml delete mode 100644 tools/regression/geom/Ref/disk.sun.da1.xml delete mode 100644 tools/regression/geom/Ref/disk.typo.ad0.xml delete mode 100644 tools/regression/geom/RunTest.sh delete mode 100644 tools/regression/geom/RunTest.t delete mode 100644 tools/regression/geom_concat/conf.sh delete mode 100644 tools/regression/geom_concat/test-1.t delete mode 100644 tools/regression/geom_concat/test-2.t delete mode 100644 tools/regression/geom_eli/attach-d.t delete mode 100644 tools/regression/geom_eli/configure-b-B.t delete mode 100644 tools/regression/geom_eli/delkey.t delete mode 100644 tools/regression/geom_eli/detach-l.t delete mode 100644 tools/regression/geom_eli/init-B.t delete mode 100644 tools/regression/geom_eli/init-J.t delete mode 100644 tools/regression/geom_eli/init-a.t delete mode 100644 tools/regression/geom_eli/init-i-P.t delete mode 100644 tools/regression/geom_eli/init.t delete mode 100644 tools/regression/geom_eli/integrity-copy.t delete mode 100644 tools/regression/geom_eli/integrity-data.t delete mode 100644 tools/regression/geom_eli/integrity-hmac.t delete mode 100644 tools/regression/geom_eli/kill.t delete mode 100644 tools/regression/geom_eli/nokey.t delete mode 100644 tools/regression/geom_eli/onetime-a.t delete mode 100644 tools/regression/geom_eli/onetime-d.t delete mode 100644 tools/regression/geom_eli/onetime.t delete mode 100644 tools/regression/geom_eli/readonly.t delete mode 100644 tools/regression/geom_eli/resize.t delete mode 100644 tools/regression/geom_eli/setkey.t delete mode 100644 tools/regression/geom_gate/Makefile delete mode 100644 tools/regression/geom_gate/runtests.sh delete mode 100644 tools/regression/geom_gate/test-1.sh delete mode 100644 tools/regression/geom_gate/test-1.t delete mode 100644 tools/regression/geom_gate/test-2.sh delete mode 100644 tools/regression/geom_gate/test-2.t delete mode 100644 tools/regression/geom_gate/test-3.sh delete mode 100644 tools/regression/geom_gate/test-3.t delete mode 100644 tools/regression/geom_gpt/gctl.t delete mode 100644 tools/regression/geom_gpt/test.c delete mode 100644 tools/regression/geom_mirror/conf.sh delete mode 100644 tools/regression/geom_mirror/test-1.t delete mode 100644 tools/regression/geom_mirror/test-2.t delete mode 100644 tools/regression/geom_mirror/test-3.t delete mode 100644 tools/regression/geom_mirror/test-4.t delete mode 100644 tools/regression/geom_mirror/test-5.t delete mode 100644 tools/regression/geom_mirror/test-6.t delete mode 100644 tools/regression/geom_mirror/test-7.t delete mode 100644 tools/regression/geom_nop/conf.sh delete mode 100644 tools/regression/geom_nop/test-1.t delete mode 100644 tools/regression/geom_nop/test-2.t delete mode 100644 tools/regression/geom_raid3/conf.sh delete mode 100644 tools/regression/geom_raid3/test-1.t delete mode 100644 tools/regression/geom_raid3/test-10.t delete mode 100644 tools/regression/geom_raid3/test-11.t delete mode 100644 tools/regression/geom_raid3/test-12.t delete mode 100644 tools/regression/geom_raid3/test-2.t delete mode 100644 tools/regression/geom_raid3/test-3.t delete mode 100644 tools/regression/geom_raid3/test-4.t delete mode 100644 tools/regression/geom_raid3/test-5.t delete mode 100644 tools/regression/geom_raid3/test-6.t delete mode 100644 tools/regression/geom_raid3/test-7.t delete mode 100644 tools/regression/geom_raid3/test-8.t delete mode 100644 tools/regression/geom_raid3/test-9.t delete mode 100644 tools/regression/geom_shsec/conf.sh delete mode 100644 tools/regression/geom_shsec/test-1.t delete mode 100644 tools/regression/geom_shsec/test-2.t delete mode 100644 tools/regression/geom_stripe/conf.sh delete mode 100644 tools/regression/geom_stripe/test-1.t delete mode 100644 tools/regression/geom_stripe/test-2.t delete mode 100644 tools/regression/geom_subr.sh delete mode 100644 tools/regression/geom_uzip/Makefile delete mode 100644 tools/regression/geom_uzip/etalon/etalon.txt delete mode 100644 tools/regression/geom_uzip/runtests.sh delete mode 100644 tools/regression/geom_uzip/test-1.img.uzip.uue delete mode 100644 tools/regression/geom_uzip/test-1.sh delete mode 100644 tools/regression/geom_uzip/test-2.sh (limited to 'tools/regression') diff --git a/tools/regression/geom/ConfCmp/ConfCmp.c b/tools/regression/geom/ConfCmp/ConfCmp.c deleted file mode 100644 index 599a953b..0000000 --- a/tools/regression/geom/ConfCmp/ConfCmp.c +++ /dev/null @@ -1,377 +0,0 @@ -/*- - * Copyright (c) 2002 Poul-Henning Kamp - * Copyright (c) 2002 Networks Associates Technology, Inc. - * All rights reserved. - * - * This software was developed for the FreeBSD Project by Poul-Henning Kamp - * and NAI Labs, the Security Research Division of Network Associates, Inc. - * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the - * DARPA CHATS research program. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The names of the authors may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -FILE *fsubs; - -struct node { - LIST_HEAD(, node) children; - LIST_ENTRY(node) siblings; - struct node *parent; - const char *name; - struct sbuf *cont; - struct sbuf *key; - char *id; - char *ref; -}; - -struct mytree { - struct node *top; - struct node *cur; - int indent; - int ignore; -}; - -struct ref { - LIST_ENTRY(ref) next; - char *k1; - char *k2; -}; - -LIST_HEAD(, ref) refs = LIST_HEAD_INITIALIZER(refs); - -static struct node * -new_node(void) -{ - struct node *np; - - np = calloc(1, sizeof *np); - np->cont = sbuf_new_auto(); - sbuf_clear(np->cont); - np->key = sbuf_new_auto(); - sbuf_clear(np->key); - LIST_INIT(&np->children); - return (np); -} - -static void -indent(int n) -{ - - printf("%*.*s", n, n, ""); -} - -static void -StartElement(void *userData, const char *name, const char **attr) -{ - struct mytree *mt; - struct node *np; - int i; - - mt = userData; - if (!strcmp(name, "FreeBSD")) { - mt->ignore = 1; - return; - } - mt->ignore = 0; - mt->indent += 2; - np = new_node(); - for (i = 0; attr[i]; i += 2) { - if (!strcmp(attr[i], "id")) - np->id = strdup(attr[i+1]); - else if (!strcmp(attr[i], "ref")) - np->ref = strdup(attr[i+1]); - } - np->name = strdup(name); - sbuf_cat(np->key, name); - sbuf_cat(np->key, "::"); - np->parent = mt->cur; - LIST_INSERT_HEAD(&mt->cur->children, np, siblings); - mt->cur = np; -} - -static void -EndElement(void *userData, const char *name __unused) -{ - struct mytree *mt; - struct node *np; - - mt = userData; - if (mt->ignore) - return; - - mt->indent -= 2; - sbuf_finish(mt->cur->cont); - LIST_FOREACH(np, &mt->cur->children, siblings) { - if (strcmp(np->name, "name")) - continue; - sbuf_cat(mt->cur->key, sbuf_data(np->cont)); - break; - } - sbuf_finish(mt->cur->key); - mt->cur = mt->cur->parent; -} - -static void -CharData(void *userData , const XML_Char *s , int len) -{ - struct mytree *mt; - const char *b, *e; - - mt = userData; - if (mt->ignore) - return; - b = s; - e = s + len - 1; - while (isspace(*b) && b < e) - b++; - while (isspace(*e) && e > b) - e--; - if (e != b || *b) - sbuf_bcat(mt->cur->cont, b, e - b + 1); -} - -static struct mytree * -dofile(char *filename) -{ - XML_Parser parser; - struct mytree *mt; - struct stat st; - int fd; - char *p; - int i; - - parser = XML_ParserCreate(NULL); - mt = calloc(1, sizeof *mt); - mt->top = new_node(); - mt->top->name = "(top)"; - mt->top->parent = mt->top; - mt->cur = mt->top; - sbuf_finish(mt->top->key); - sbuf_finish(mt->top->cont); - XML_SetUserData(parser, mt); - XML_SetElementHandler(parser, StartElement, EndElement); - XML_SetCharacterDataHandler(parser, CharData); - fd = open(filename, O_RDONLY); - if (fd < 0) - err(1, filename); - fstat(fd, &st); - p = mmap(NULL, st.st_size, PROT_READ, MAP_NOCORE|MAP_PRIVATE, fd, 0); - i = XML_Parse(parser, p, st.st_size, 1); - if (i != 1) - errx(1, "XML_Parse complained -> %d", i); - munmap(p, st.st_size); - close(fd); - XML_ParserFree(parser); - sbuf_finish(mt->top->cont); - if (i) - return (mt); - else - return (NULL); -} - -static void -print_node(struct node *np) -{ - printf("\"%s\" -- \"%s\" -- \"%s\"", np->name, sbuf_data(np->cont), sbuf_data(np->key)); - if (np->id) - printf(" id=\"%s\"", np->id); - if (np->ref) - printf(" ref=\"%s\"", np->ref); - printf("\n"); -} - -static void -print_tree(struct node *np, int n) -{ - struct node *np1; - - indent(n); printf("%s id=%s ref=%s\n", np->name, np->id, np->ref); - LIST_FOREACH(np1, &np->children, siblings) - print_tree(np1, n + 2); -} - -static void -sort_node(struct node *np) -{ - struct node *np1, *np2; - int n; - - LIST_FOREACH(np1, &np->children, siblings) - sort_node(np1); - do { - np1 = LIST_FIRST(&np->children); - n = 0; - for (;;) { - if (np1 == NULL) - return; - np2 = LIST_NEXT(np1, siblings); - if (np2 == NULL) - return; - if (strcmp(sbuf_data(np1->key), sbuf_data(np2->key)) > 0) { - LIST_REMOVE(np2, siblings); - LIST_INSERT_BEFORE(np1, np2, siblings); - n++; - break; - } - np1 = np2; - } - } while (n); -} - -static int -refcmp(char *r1, char *r2) -{ - struct ref *r; - - LIST_FOREACH(r, &refs, next) { - if (!strcmp(r1, r->k1)) - return (strcmp(r2, r->k2)); - } - r = calloc(1, sizeof(*r)); - r->k1 = strdup(r1); - r->k2 = strdup(r2); - LIST_INSERT_HEAD(&refs, r, next); - if (fsubs != NULL) { - fprintf(fsubs, "s/%s/%s/g\n", r1, r2); - fflush(fsubs); - } - return (0); -} - -static int compare_node2(struct node *n1, struct node *n2, int in); - -static int -compare_node(struct node *n1, struct node *n2, int in) -{ - int i; - struct node *n1a, *n2a; - - i = strcmp(n1->name, n2->name); - if (i) - return (i); - if (n1->id && n2->id) - i = refcmp(n1->id, n2->id); - else if (n1->id || n2->id) - i = -1; - if (i) - return (i); - if (n1->ref && n2->ref) - i = refcmp(n1->ref, n2->ref); - else if (n1->ref || n2->ref) - i = -1; - if (i) - return (i); - if (!strcmp(n1->name, "ref")) - i = refcmp(sbuf_data(n1->cont), sbuf_data(n2->cont)); - else - i = strcmp(sbuf_data(n1->cont), sbuf_data(n2->cont)); - if (i) - return (1); - n1a = LIST_FIRST(&n1->children); - n2a = LIST_FIRST(&n2->children); - for (;;) { - if (n1a == NULL && n2a == NULL) - return (0); - if (n1a != NULL && n2a == NULL) { - printf("1>"); - indent(in); - print_node(n1a); - printf("2>\n"); - return (1); - } - if (n1a == NULL && n2a != NULL) { - printf("1>\n"); - printf("2>"); - indent(in); - print_node(n2a); - return (1); - } - i = compare_node2(n1a, n2a, in + 2); - if (i) - return (1); - n1a = LIST_NEXT(n1a, siblings); - n2a = LIST_NEXT(n2a, siblings); - } - return (0); -} - -static int -compare_node2(struct node *n1, struct node *n2, int in) -{ - int i; - - i = compare_node(n1, n2, in); - if (i) { - printf("1>"); - indent(in); - print_node(n1); - printf("2>"); - indent(in); - print_node(n2); - } - return (i); -} - - - -int -main(int argc, char **argv) -{ - struct mytree *t1, *t2; - int i; - - fsubs = fopen("_.subs", "w"); - setbuf(stdout, NULL); - setbuf(stderr, NULL); - if (argc != 3) - errx(1, "usage: %s file1 file2", argv[0]); - - t1 = dofile(argv[1]); - if (t1 == NULL) - errx(2, "XML parser error on file %s", argv[1]); - sort_node(t1->top); - t2 = dofile(argv[2]); - if (t2 == NULL) - errx(2, "XML parser error on file %s", argv[2]); - sort_node(t2->top); - i = compare_node(t1->top, t2->top, 0); - return (i); -} - diff --git a/tools/regression/geom/ConfCmp/Makefile b/tools/regression/geom/ConfCmp/Makefile deleted file mode 100644 index f550db3..0000000 --- a/tools/regression/geom/ConfCmp/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# $FreeBSD$ - -PROG= ConfCmp -SRCS+= ConfCmp.c -SRCS+= subr_sbuf.c - -.PATH: ../../../../sys/kern - -NO_OBJ= -WARNS?= 5 -CFLAGS+= -g -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -static -# Uncomment for ElectricFence -#LDADD += -lefence -L/usr/local/lib - -DPADD += ${LIBBSDXML} -LDADD += -lbsdxml - -MAN= -CLEANFILES += _* - -.include - -test: ${PROG} - rm -f _* *.core - ./${PROG} a1.conf a1.conf - ./${PROG} a1.conf a1a.conf - if ./${PROG} a1.conf a1b.conf > /dev/null 2>&1 ; then exit 1 ; fi - if ./${PROG} a1.conf a1c.conf > /dev/null 2>&1 ; then exit 1 ; fi - if ./${PROG} a1.conf a1d.conf > /dev/null 2>&1 ; then exit 1 ; fi - ./${PROG} a2.conf a2.conf - ./${PROG} a2.conf a2a.conf - if ./${PROG} a2.conf a2b.conf > /dev/null 2>&1 ; then exit 1 ; fi - if ./${PROG} a2.conf a2c.conf > /dev/null 2>&1 ; then exit 1 ; fi - if ./${PROG} a2.conf a2d.conf > /dev/null 2>&1 ; then exit 1 ; fi - diff --git a/tools/regression/geom/ConfCmp/a1.conf b/tools/regression/geom/ConfCmp/a1.conf deleted file mode 100644 index 94171cd..0000000 --- a/tools/regression/geom/ConfCmp/a1.conf +++ /dev/null @@ -1,414 +0,0 @@ - - $FreeBSD$ - - 0x80712c0 - DEV-method - - 0x80bfd00 - 0x80712c0 - ad0s3d - 4 - - 0x80b9500 - 0x80bfd00 - 0x80bf880 - r0w0e0 - - - - 0x80bfc80 - 0x80712c0 - ad0s3c - 4 - - 0x80b94c0 - 0x80bfc80 - 0x80bf800 - r0w0e0 - - - - 0x80bfc00 - 0x80712c0 - ad0s3a - 4 - - 0x80b9480 - 0x80bfc00 - 0x80bf780 - r0w0e0 - - - - 0x80bfb80 - 0x80712c0 - ad0s2c - 4 - - 0x80b9440 - 0x80bfb80 - 0x80bf600 - r0w0e0 - - - - 0x80bfb00 - 0x80712c0 - ad0s1f - 4 - - 0x80b9400 - 0x80bfb00 - 0x80bf480 - r0w0e0 - - - - 0x80bfa80 - 0x80712c0 - ad0s1e - 4 - - 0x80b93c0 - 0x80bfa80 - 0x80bf400 - r0w0e0 - - - - 0x80bfa00 - 0x80712c0 - ad0s1c - 4 - - 0x80b9380 - 0x80bfa00 - 0x80bf380 - r0w0e0 - - - - 0x80bf980 - 0x80712c0 - ad0s1b - 4 - - 0x80b9340 - 0x80bf980 - 0x80bf300 - r0w0e0 - - - - 0x80bf900 - 0x80712c0 - ad0s1a - 4 - - 0x80b9300 - 0x80bf900 - 0x80bf280 - r0w0e0 - - - - 0x80bf680 - 0x80712c0 - ad0s3 - 3 - - 0x80b9280 - 0x80bf680 - 0x80bf100 - r0w0e0 - - - - 0x80bf500 - 0x80712c0 - ad0s2 - 3 - - 0x80b9200 - 0x80bf500 - 0x80bf080 - r0w0e0 - - - - 0x80bf180 - 0x80712c0 - ad0s1 - 3 - - 0x80b9180 - 0x80bf180 - 0x80bf000 - r0w0e0 - - - - 0x80b9080 - 0x80712c0 - ad0 - 2 - - 0x80b90c0 - 0x80b9080 - 0x80b9040 - r0w0e0 - - - - - 0x8071280 - MBREXT-method - - - 0x8071260 - MBR-method - - 0x80b9100 - 0x8071260 - ad0 - 2 - - - - 0x80b9140 - 0x80b9100 - 0x80b9040 - r0w0e0 - - - - - 0x80bf100 - 0x80b9100 - r0w0e0 - ad0s3 - - 2 - 8585256960 - 16768080 - 8585256960 - 16768080 - 165 - - - - 0x80bf080 - 0x80b9100 - r0w0e0 - ad0s2 - - 1 - 5364817920 - 10478160 - 3220439040 - 6289920 - 165 - - - - 0x80bf000 - 0x80b9100 - r0w0e0 - ad0s1 - - 0 - 3220406784 - 6289857 - 32256 - 63 - 165 - - - - - - 0x80712a0 - BSD-method - - 0x80bf700 - 0x80712a0 - ad0s3 - 3 - - - - 0x80b92c0 - 0x80bf700 - 0x80bf100 - r0w0e0 - - - - - 0x80bf880 - 0x80bf700 - r0w0e0 - ad0s3d - - 3 - 6488104960 - 12672080 - 10682408960 - 20864080 - - - - 0x80bf800 - 0x80bf700 - r0w0e0 - ad0s3c - - 2 - 8585256960 - 16768080 - 8585256960 - 16768080 - - - - 0x80bf780 - 0x80bf700 - r0w0e0 - ad0s3a - - 0 - 2097152000 - 4096000 - 8585256960 - 16768080 - - - - - 0x80bf580 - 0x80712a0 - ad0s2 - 3 - - - - 0x80b9240 - 0x80bf580 - 0x80bf080 - r0w0e0 - - - - - 0x80bf600 - 0x80bf580 - r0w0e0 - ad0s2c - - 2 - 5364817920 - 10478160 - 3220439040 - 6289920 - - - - - 0x80bf200 - 0x80712a0 - ad0s1 - 3 - - - - 0x80b91c0 - 0x80bf200 - 0x80bf000 - r0w0e0 - - - - - 0x80bf480 - 0x80bf200 - r0w0e0 - ad0s1f - - 5 - 2066973184 - 4037057 - 1153465856 - 2252863 - - - - 0x80bf400 - 0x80bf200 - r0w0e0 - ad0s1e - - 4 - 524288000 - 1024000 - 629177856 - 1228863 - - - - 0x80bf380 - 0x80bf200 - r0w0e0 - ad0s1c - - 2 - 3220406784 - 6289857 - 32256 - 63 - - - - 0x80bf300 - 0x80bf200 - r0w0e0 - ad0s1b - - 1 - 524288000 - 1024000 - 104889856 - 204863 - - - - 0x80bf280 - 0x80bf200 - r0w0e0 - ad0s1a - - 0 - 104857600 - 204800 - 32256 - 63 - - - - - - 0x80711c0 - SIMDISK-method - - 0x80b9000 - 0x80711c0 - ad0 - 1 - - 0x80b9040 - 0x80b9000 - r0w0e0 - ad0 - - - - diff --git a/tools/regression/geom/ConfCmp/a1a.conf b/tools/regression/geom/ConfCmp/a1a.conf deleted file mode 100644 index 01110f3..0000000 --- a/tools/regression/geom/ConfCmp/a1a.conf +++ /dev/null @@ -1,414 +0,0 @@ - - $FreeBSD$ - - 0x90712c0 - DEV-method - - 0x90bfd00 - 0x90712c0 - ad0s3d - 4 - - 0x90b9500 - 0x90bfd00 - 0x90bf880 - r0w0e0 - - - - 0x90bfc80 - 0x90712c0 - ad0s3c - 4 - - 0x90b94c0 - 0x90bfc80 - 0x90bf800 - r0w0e0 - - - - 0x90bfc00 - 0x90712c0 - ad0s3a - 4 - - 0x90b9480 - 0x90bfc00 - 0x90bf780 - r0w0e0 - - - - 0x90bfb80 - 0x90712c0 - ad0s2c - 4 - - 0x90b9440 - 0x90bfb80 - 0x90bf600 - r0w0e0 - - - - 0x90bfb00 - 0x90712c0 - ad0s1f - 4 - - 0x90b9400 - 0x90bfb00 - 0x90bf480 - r0w0e0 - - - - 0x90bfa80 - 0x90712c0 - ad0s1e - 4 - - 0x90b93c0 - 0x90bfa80 - 0x90bf400 - r0w0e0 - - - - 0x90bfa00 - 0x90712c0 - ad0s1c - 4 - - 0x90b9380 - 0x90bfa00 - 0x90bf380 - r0w0e0 - - - - 0x90bf980 - 0x90712c0 - ad0s1b - 4 - - 0x90b9340 - 0x90bf980 - 0x90bf300 - r0w0e0 - - - - 0x90bf900 - 0x90712c0 - ad0s1a - 4 - - 0x90b9300 - 0x90bf900 - 0x90bf280 - r0w0e0 - - - - 0x90bf680 - 0x90712c0 - ad0s3 - 3 - - 0x90b9280 - 0x90bf680 - 0x90bf100 - r0w0e0 - - - - 0x90bf500 - 0x90712c0 - ad0s2 - 3 - - 0x90b9200 - 0x90bf500 - 0x90bf080 - r0w0e0 - - - - 0x90bf180 - 0x90712c0 - ad0s1 - 3 - - 0x90b9180 - 0x90bf180 - 0x90bf000 - r0w0e0 - - - - 0x90b9080 - 0x90712c0 - ad0 - 2 - - 0x90b90c0 - 0x90b9080 - 0x90b9040 - r0w0e0 - - - - - 0x9071280 - MBREXT-method - - - 0x9071260 - MBR-method - - 0x90b9100 - 0x9071260 - ad0 - 2 - - - - 0x90b9140 - 0x90b9100 - 0x90b9040 - r0w0e0 - - - - - 0x90bf100 - 0x90b9100 - r0w0e0 - ad0s3 - - 2 - 8585256960 - 16768080 - 8585256960 - 16768080 - 165 - - - - 0x90bf080 - 0x90b9100 - r0w0e0 - ad0s2 - - 1 - 5364817920 - 10478160 - 3220439040 - 6289920 - 165 - - - - 0x90bf000 - 0x90b9100 - r0w0e0 - ad0s1 - - 0 - 3220406784 - 6289857 - 32256 - 63 - 165 - - - - - - 0x90712a0 - BSD-method - - 0x90bf700 - 0x90712a0 - ad0s3 - 3 - - - - 0x90b92c0 - 0x90bf700 - 0x90bf100 - r0w0e0 - - - - - 0x90bf880 - 0x90bf700 - r0w0e0 - ad0s3d - - 3 - 6488104960 - 12672080 - 10682408960 - 20864080 - - - - 0x90bf800 - 0x90bf700 - r0w0e0 - ad0s3c - - 2 - 8585256960 - 16768080 - 8585256960 - 16768080 - - - - 0x90bf780 - 0x90bf700 - r0w0e0 - ad0s3a - - 0 - 2097152000 - 4096000 - 8585256960 - 16768080 - - - - - 0x90bf580 - 0x90712a0 - ad0s2 - 3 - - - - 0x90b9240 - 0x90bf580 - 0x90bf080 - r0w0e0 - - - - - 0x90bf600 - 0x90bf580 - r0w0e0 - ad0s2c - - 2 - 5364817920 - 10478160 - 3220439040 - 6289920 - - - - - 0x90bf200 - 0x90712a0 - ad0s1 - 3 - - - - 0x90b91c0 - 0x90bf200 - 0x90bf000 - r0w0e0 - - - - - 0x90bf480 - 0x90bf200 - r0w0e0 - ad0s1f - - 5 - 2066973184 - 4037057 - 1153465856 - 2252863 - - - - 0x90bf400 - 0x90bf200 - r0w0e0 - ad0s1e - - 4 - 524288000 - 1024000 - 629177856 - 1228863 - - - - 0x90bf380 - 0x90bf200 - r0w0e0 - ad0s1c - - 2 - 3220406784 - 6289857 - 32256 - 63 - - - - 0x90bf300 - 0x90bf200 - r0w0e0 - ad0s1b - - 1 - 524288000 - 1024000 - 104889856 - 204863 - - - - 0x90bf280 - 0x90bf200 - r0w0e0 - ad0s1a - - 0 - 104857600 - 204800 - 32256 - 63 - - - - - - 0x90711c0 - SIMDISK-method - - 0x90b9000 - 0x90711c0 - ad0 - 1 - - 0x90b9040 - 0x90b9000 - r0w0e0 - ad0 - - - - diff --git a/tools/regression/geom/ConfCmp/a1b.conf b/tools/regression/geom/ConfCmp/a1b.conf deleted file mode 100644 index 46f423b..0000000 --- a/tools/regression/geom/ConfCmp/a1b.conf +++ /dev/null @@ -1,414 +0,0 @@ - - $FreeBSD$ - - 0x80712c0 - DEV-method - - 0x80bfd00 - 0x80712c0 - ad0s3d - 4 - - 0x80b9500 - 0x80bfd00 - 0x80bf880 - r0w0e0 - - - - 0x80bfc80 - 0x80712c0 - ad0s3c - 4 - - 0x80b94c0 - 0x80bfc80 - 0x80bf800 - r0w0e0 - - - - 0x80bfc00 - 0x80712c0 - ad0s3a - 4 - - 0x80b9480 - 0x80bfc00 - 0x80bf780 - r0w0e0 - - - - 0x80bfb80 - 0x80712c0 - ad0s2c - 4 - - 0x80b9440 - 0x80bfb80 - 0x80bf600 - r0w0e0 - - - - 0x80bfb00 - 0x80712c0 - ad0s1f - 4 - - 0x80b9400 - 0x80bfb00 - 0x80bf480 - r0w0e0 - - - - 0x80bfa80 - 0x80712c0 - ad0s1e - 4 - - 0x80b93c0 - 0x80bfa80 - 0x80bf400 - r0w0e0 - - - - 0x80bfa00 - 0x80712c0 - ad0s1c - 4 - - 0x80b9380 - 0x80bfa00 - 0x80bf380 - r0w0e0 - - - - 0x80bf980 - 0x80712c0 - ad0s1b - 4 - - 0x80b9340 - 0x80bf980 - 0x80bf300 - r0w0e0 - - - - 0x80bf900 - 0x80712c0 - ad0s1a - 4 - - 0x80b9300 - 0x80bf900 - 0x80bf280 - r0w0e0 - - - - 0x80bf680 - 0x80712c0 - ad0s3 - 3 - - 0x80b9280 - 0x80bf680 - 0x80bf100 - r0w0e0 - - - - 0x80bf500 - 0x80712c0 - ad0s2 - 3 - - 0x80b9200 - 0x80bf500 - 0x80bf080 - r0w0e0 - - - - 0x80bf180 - 0x80712c0 - ad0s1 - 3 - - 0x80b9180 - 0x80bf180 - 0x80bf000 - r0w0e0 - - - - 0x80b9080 - 0x80712c0 - ad0 - 2 - - 0x80b90c0 - 0x80b9080 - 0x80b9040 - r0w0e0 - - - - - 0x8071280 - MBREXT-method - - - 0x8071260 - MBR-method - - 0x80b9100 - 0x8071260 - ad0 - 2 - - - - 0x80b9140 - 0x80b9100 - 0x80b9040 - r0w0e0 - - - - - 0x80bf100 - 0x80b9100 - r0w0e0 - ad0s3 - - 2 - 8585256960 - 16768080 - 8585256960 - 16768080 - 165 - - - - 0x80bf080 - 0x80b9100 - r0w0e0 - ad0s2 - - 1 - 5364817920 - 10478160 - 3220439040 - 6289920 - 165 - - - - 0x80bf000 - 0x80b9100 - r0w0e0 - ad0s1 - - 0 - 3220406784 - 6289857 - 32256 - 63 - 165 - - - - - - 0x80712a0 - BSD-method - - 0x80bf700 - 0x80712a0 - ad0s3 - 3 - - - - 0x80b92c0 - 0x80bf700 - 0x80bf100 - r0w0e0 - - - - - 0x80bf880 - 0x80bf700 - r0w0e0 - ad0s3d - - 3 - 6488104960 - 12672080 - 10682408960 - 20864080 - - - - 0x80bf800 - 0x80bf700 - r0w0e0 - ad0s3c - - 2 - 8585256960 - 16768080 - 8585256960 - 16768080 - - - - 0x80bf780 - 0x80bf700 - r0w0e0 - ad0s3a - - 0 - 2097152000 - 4096000 - 8585256960 - 16768080 - - - - - 0x80bf580 - 0x80712a0 - ad0s2 - 3 - - - - 0x80b9240 - 0x80bf580 - 0x80bf080 - r0w0e0 - - - - - 0x80bf600 - 0x80bf580 - r0w0e0 - ad0s2c - - 2 - 5364817920 - 10478160 - 3220439040 - 6289920 - - - - - 0x80bf200 - 0x80712a0 - ad0s1 - 3 - - - - 0x80b91c0 - 0x80bf200 - 0x80bf000 - r0w0e0 - - - - - 0x80bf480 - 0x80bf200 - r0w0e0 - ad0s1f - - 5 - 2066973184 - 4037057 - 1153465856 - 2252863 - - - - 0x80bf400 - 0x80bf200 - r0w0e0 - ad0s1e - - 4 - 524288000 - 1024000 - 629177856 - 1228863 - - - - 0x80bf380 - 0x80bf200 - r0w0e0 - ad0s1c - - 2 - 3220406784 - 6289857 - 32256 - 63 - - - - 0x80bf300 - 0x80bf200 - r0w0e0 - ad0s1b - - 1 - 524288000 - 1024000 - 104889856 - 204863 - - - - 0x80bf280 - 0x80bf200 - r0w0e0 - ad0s1a - - 0 - 104857600 - 204800 - 32256 - 63 - - - - - - 0x80711c0 - SIMDISK-method - - 0x80b9000 - 0x80711c0 - ad0 - 1 - - 0x80b9041 - 0x80b9000 - r0w0e0 - ad0 - - - - diff --git a/tools/regression/geom/ConfCmp/a1c.conf b/tools/regression/geom/ConfCmp/a1c.conf deleted file mode 100644 index 1b5a2b9..0000000 --- a/tools/regression/geom/ConfCmp/a1c.conf +++ /dev/null @@ -1,414 +0,0 @@ - - $FreeBSD$ - - 0x80712c0 - DEV-method - - 0x80bfd00 - 0x80712c0 - ad0s3d - 4 - - 0x80b9500 - 0x80bfd00 - 0x80bf880 - r0w0e0 - - - - 0x80bfc80 - 0x80712c0 - ad0s3c - 4 - - 0x80b94c0 - 0x80bfc80 - 0x80bf800 - r0w0e0 - - - - 0x80bfc00 - 0x80712c0 - ad0s3a - 4 - - 0x80b9480 - 0x80bfc00 - 0x80bf780 - r0w0e0 - - - - 0x80bfb80 - 0x80712c0 - ad0s2c - 4 - - 0x80b9440 - 0x80bfb80 - 0x80bf600 - r0w0e0 - - - - 0x80bfb00 - 0x80712c0 - ad0s1f - 4 - - 0x80b9400 - 0x80bfb00 - 0x80bf480 - r0w0e0 - - - - 0x80bfa80 - 0x80712c0 - ad0s1e - 4 - - 0x80b93c0 - 0x80bfa80 - 0x80bf400 - r0w0e0 - - - - 0x80bfa00 - 0x80712c0 - ad0s1c - 4 - - 0x80b9380 - 0x80bfa00 - 0x80bf380 - r0w0e0 - - - - 0x80bf980 - 0x80712c0 - ad0s1b - 4 - - 0x80b9340 - 0x80bf980 - 0x80bf300 - r0w0e0 - - - - 0x80bf900 - 0x80712c0 - ad0s1a - 4 - - 0x80b9300 - 0x80bf900 - 0x80bf280 - r0w0e0 - - - - 0x80bf680 - 0x80712c0 - ad0s3 - 3 - - 0x80b9280 - 0x80bf680 - 0x80bf100 - r0w0e0 - - - - 0x80bf500 - 0x80712c0 - ad0s2 - 3 - - 0x80b9200 - 0x80bf500 - 0x80bf080 - r0w0e0 - - - - 0x80bf180 - 0x80712c0 - ad0s1 - 3 - - 0x80b9180 - 0x80bf180 - 0x80bf000 - r0w0e0 - - - - 0x80b9080 - 0x80712c0 - ad0 - 2 - - 0x80b90c0 - 0x80b9080 - 0x80b9040 - r0w0e0 - - - - - 0x8071280 - MBREXT-method - - - 0x8071260 - MBR-method - - 0x80b9100 - 0x8071260 - ad0 - 2 - - - - 0x80b9140 - 0x80b9100 - 0x80b9040 - r0w0e0 - - - - - 0x80bf100 - 0x80b9100 - r0w0e0 - ad0s3 - - 2 - 8585256960 - 16768080 - 8585256960 - 16768080 - 165 - - - - 0x80bf080 - 0x80b9100 - r0w0e0 - ad0s2 - - 1 - 5364817920 - 10478160 - 3220439040 - 6289920 - 165 - - - - 0x80bf000 - 0x80b9100 - r0w0e0 - ad0s1 - - 0 - 3220406784 - 6289857 - 32256 - 63 - 165 - - - - - - 0x80712a0 - BSD-method - - 0x80bf700 - 0x80712a0 - ad0s3 - 3 - - - - 0x80b92c0 - 0x80bf700 - 0x80bf100 - r0w0e0 - - - - - 0x80bf880 - 0x80bf700 - r0w0e0 - ad0s3d - - 3 - 6488104960 - 12672080 - 10682408960 - 20864080 - - - - 0x80bf800 - 0x80bf700 - r0w0e0 - ad0s3c - - 2 - 8585256960 - 16768080 - 8585256960 - 16768080 - - - - 0x80bf780 - 0x80bf700 - r0w0e0 - ad0s3a - - 0 - 2097152000 - 4096000 - 8585256960 - 16768080 - - - - - 0x80bf580 - 0x80712a0 - ad0s2 - 3 - - - - 0x80b9240 - 0x80bf580 - 0x80bf080 - r0w0e0 - - - - - 0x80bf600 - 0x80bf580 - r0w0e0 - ad0s2c - - 2 - 5364817920 - 10478160 - 3220439040 - 6289920 - - - - - 0x80bf200 - 0x80712a0 - ad0s1 - 3 - - - - 0x80b91c0 - 0x80bf200 - 0x80bf000 - r0w0e0 - - - - - 0x80bf480 - 0x80bf200 - r0w0e0 - ad0s1f - - 5 - 2066973184 - 4037057 - 1153465856 - 2252863 - - - - 0x80bf400 - 0x80bf200 - r0w0e0 - ad0s1e - - 4 - 524288000 - 1024000 - 629177856 - 1228863 - - - - 0x80bf380 - 0x80bf200 - r0w0e0 - ad0s1c - - 2 - 3220406784 - 6289857 - 32256 - 63 - - - - 0x80bf300 - 0x80bf200 - r0w0e0 - ad0s1b - - 1 - 524288000 - 1024000 - 104889856 - 204863 - - - - 0x80bf280 - 0x80bf200 - r0w0e0 - ad0s1a - - 0 - 104857600 - 204800 - 32256 - 63 - - - - - - 0x80711c0 - SIMDISK-method - - 0x80b9000 - 0x80711c0 - ad0 - 1 - - 0x80b9040 - 0x80b9000 - r0w0e1 - ad0 - - - - diff --git a/tools/regression/geom/ConfCmp/a1d.conf b/tools/regression/geom/ConfCmp/a1d.conf deleted file mode 100644 index a9063c5..0000000 --- a/tools/regression/geom/ConfCmp/a1d.conf +++ /dev/null @@ -1,414 +0,0 @@ - - $FreeBSD$ - - 0x80712c0 - DEV-method - - 0x80bfd00 - 0x80712c0 - ad0s3d - 4 - - 0x80b9500 - 0x80bfd00 - 0x80bf880 - r0w0e0 - - - - 0x80bfc80 - 0x80712c0 - ad0s3c - 4 - - 0x80b94c0 - 0x80bfc80 - 0x80bf800 - r0w0e0 - - - - 0x80bfc00 - 0x80712c0 - ad0s3a - 4 - - 0x80b9480 - 0x80bfc00 - 0x80bf780 - r0w0e0 - - - - 0x80bfb80 - 0x80712c0 - ad0s2c - 4 - - 0x80b9440 - 0x80bfb80 - 0x80bf600 - r0w0e0 - - - - 0x80bfb00 - 0x80712c0 - ad0s1f - 4 - - 0x80b9400 - 0x80bfb00 - 0x80bf480 - r0w0e0 - - - - 0x80bfa80 - 0x80712c0 - ad0s1e - 4 - - 0x80b93c0 - 0x80bfa80 - 0x80bf400 - r0w0e0 - - - - 0x80bfa00 - 0x80712c0 - ad0s1c - 4 - - 0x80b9380 - 0x80bfa00 - 0x80bf380 - r0w0e0 - - - - 0x80bf980 - 0x80712c0 - ad0s1b - 4 - - 0x80b9340 - 0x80bf980 - 0x80bf300 - r0w0e0 - - - - 0x80bf900 - 0x80712c0 - ad0s1a - 4 - - 0x80b9300 - 0x80bf900 - 0x80bf280 - r0w0e0 - - - - 0x80bf680 - 0x80712c0 - ad0s3 - 3 - - 0x80b9280 - 0x80bf680 - 0x80bf100 - r0w0e0 - - - - 0x80bf500 - 0x80712c0 - ad0s2 - 3 - - 0x80b9200 - 0x80bf500 - 0x80bf080 - r0w0e0 - - - - 0x80bf180 - 0x80712c0 - ad0s1 - 3 - - 0x80b9180 - 0x80bf180 - 0x80bf000 - r0w0e0 - - - - 0x80b9080 - 0x80712c0 - ad0 - 2 - - 0x80b90c0 - 0x80b9080 - 0x80b9040 - r0w0e0 - - - - - 0x8071280 - MBREXT-method - - - 0x8071260 - MBR-method - - 0x80b9100 - 0x8071260 - ad0 - 2 - - - - 0x80b9140 - 0x80b9100 - 0x80b9040 - r0w0e0 - - - - - 0x80bf100 - 0x80b9100 - r0w0e0 - ad0s3 - - 2 - 8585256960 - 16768080 - 8585256960 - 16768080 - 165 - - - - 0x80bf080 - 0x80b9100 - r0w0e0 - ad0s2 - - 1 - 5364817920 - 10478160 - 3220439040 - 6289920 - 165 - - - - 0x80bf000 - 0x80b9100 - r0w0e0 - ad0s1 - - 0 - 3220406784 - 6289857 - 32256 - 63 - 165 - - - - - - 0x80712a0 - BSD-method - - 0x80bf700 - 0x80712a0 - ad0s3 - 3 - - - - 0x80b92c0 - 0x80bf700 - 0x80bf100 - r0w0e0 - - - - - 0x80bf880 - 0x80bf700 - r0w0e0 - ad0s3d - - 3 - 6488104960 - 12672080 - 10682408960 - 20864080 - - - - 0x80bf800 - 0x80bf700 - r0w0e0 - ad0s3c - - 2 - 8585256960 - 16768080 - 8585256960 - 16768080 - - - - 0x80bf780 - 0x80bf700 - r0w0e0 - ad0s3a - - 0 - 2097152000 - 4096000 - 8585256960 - 16768080 - - - - - 0x80bf580 - 0x80712a0 - ad0s2 - 3 - - - - 0x80b9240 - 0x80bf580 - 0x80bf080 - r0w0e0 - - - - - 0x80bf600 - 0x80bf580 - r0w0e0 - ad0s2c - - 2 - 5364817920 - 10478160 - 3220439040 - 6289920 - - - - - 0x80bf200 - 0x80712a0 - ad0s1 - 3 - - - - 0x80b91c0 - 0x80bf200 - 0x80bf000 - r0w0e0 - - - - - 0x80bf480 - 0x80bf200 - r0w0e0 - ad0s1f - - 5 - 2066973184 - 4037057 - 1153465856 - 2252863 - - - - 0x80bf400 - 0x80bf200 - r0w0e0 - ad0s1e - - 4 - 524288000 - 1024000 - 629177856 - 1228863 - - - - 0x80bf380 - 0x80bf200 - r0w0e0 - ad0s1c - - 2 - 3220406784 - 6289857 - 32256 - 63 - - - - 0x80bf300 - 0x80bf200 - r0w0e0 - ad0s1b - - 1 - 524288000 - 1024000 - 104889856 - 204863 - - - - 0x80bf280 - 0x80bf200 - r0w0e0 - ad0s1a - - 0 - 104857600 - 204800 - 32256 - 63 - - - - - - 0x80711c0 - SIMDISK-method - - 0x80b9000 - 0x80711c0 - ad0 - 1 - - 0x80b9040 - 0x80b9000 - r0w0e0 - ad0 - - - - diff --git a/tools/regression/geom/ConfCmp/a2.conf b/tools/regression/geom/ConfCmp/a2.conf deleted file mode 100644 index 6688fd1..0000000 --- a/tools/regression/geom/ConfCmp/a2.conf +++ /dev/null @@ -1,207 +0,0 @@ - - $FreeBSD$ - - DEV-class - - - wd0s1f - 4 - - - - r0w0e0 - - - - - wd0s1e - 4 - - - - r0w0e0 - - - - - wd0s1c - 4 - - - - r0w0e0 - - - - - wd0s1b - 4 - - - - r0w0e0 - - - - - wd0s1a - 4 - - - - r0w0e0 - - - - - wd0s1 - 3 - - - - r0w0e0 - - - - - wd0 - 2 - - - - r0w0e0 - - - - - PC98-class - - - wd0 - 2 - - 8704 - - - - - r0w0e0 - - - - - - r0w0e0 - wd0s1 - - 0 - 1626533888 - 3176824 - 69632 - 136 - - - - - - SUNLABEL-class - - - MBREXT-class - - - MBR-class - - - BSD-class - - - wd0s1 - 3 - - 512 - 8192 - - - - - r0w0e0 - - - - - - r0w0e0 - wd0s1f - - 5 - 1390673920 - 2716160 - 235929600 - 460800 - - - - - r0w0e0 - wd0s1e - - 4 - 52428800 - 102400 - 183500800 - 358400 - - - - - r0w0e0 - wd0s1c - - 2 - 1626603520 - 3176960 - 0 - 0 - - - - - r0w0e0 - wd0s1b - - 1 - 104857600 - 204800 - 78643200 - 153600 - - - - - r0w0e0 - wd0s1a - - 0 - 78643200 - 153600 - 0 - 0 - - - - - - SIMDISK-class - - - wd0 - 1 - - - r0w0e0 - wd0 - - - - diff --git a/tools/regression/geom/ConfCmp/a2a.conf b/tools/regression/geom/ConfCmp/a2a.conf deleted file mode 100644 index 3d35fe9..0000000 --- a/tools/regression/geom/ConfCmp/a2a.conf +++ /dev/null @@ -1,207 +0,0 @@ - - $FreeBSD$ - - DEV-class - - - wd0s1f - 4 - - - - r0w0e0 - - - - - wd0s1e - 4 - - - - r0w0e0 - - - - - wd0s1c - 4 - - - - r0w0e0 - - - - - wd0s1b - 4 - - - - r0w0e0 - - - - - wd0s1a - 4 - - - - r0w0e0 - - - - - wd0s1 - 3 - - - - r0w0e0 - - - - - wd0 - 2 - - - - r0w0e0 - - - - - PC98-class - - - wd0 - 2 - - 8704 - - - - - r0w0e0 - - - - - - r0w0e0 - wd0s1 - - 0 - 1626533888 - 3176824 - 69632 - 136 - - - - - - SUNLABEL-class - - - MBREXT-class - - - MBR-class - - - BSD-class - - - wd0s1 - 3 - - 512 - 8192 - - - - - r0w0e0 - - - - - - r0w0e0 - wd0s1f - - 5 - 1390673920 - 2716160 - 235929600 - 460800 - - - - - r0w0e0 - wd0s1e - - 4 - 52428800 - 102400 - 183500800 - 358400 - - - - - r0w0e0 - wd0s1c - - 2 - 1626603520 - 3176960 - 0 - 0 - - - - - r0w0e0 - wd0s1b - - 1 - 104857600 - 204800 - 78643200 - 153600 - - - - - r0w0e0 - wd0s1a - - 0 - 78643200 - 153600 - 0 - 0 - - - - - - SIMDISK-class - - - wd0 - 1 - - - r0w0e0 - wd0 - - - - diff --git a/tools/regression/geom/ConfCmp/a2b.conf b/tools/regression/geom/ConfCmp/a2b.conf deleted file mode 100644 index 58c0e15..0000000 --- a/tools/regression/geom/ConfCmp/a2b.conf +++ /dev/null @@ -1,207 +0,0 @@ - - $FreeBSD$ - - DEV-class - - - wd0s1f - 4 - - - - r0w0e0 - - - - - wd0s1e - 4 - - - - r0w0e0 - - - - - wd0s1c - 4 - - - - r0w0e0 - - - - - wd0s1b - 4 - - - - r0w0e0 - - - - - wd0s1a - 4 - - - - r0w0e0 - - - - - wd0s1 - 3 - - - - r0w0e0 - - - - - wd0 - 2 - - - - r0w0e0 - - - - - PC98-class - - - wd0 - 2 - - 8704 - - - - - r0w0e0 - - - - - - r0w0e0 - wd0s1 - - 0 - 1626533888 - 3176824 - 69632 - 136 - - - - - - SUNLABEL-class - - - MBREXT-class - - - MBR-class - - - BSD-class - - - wd0s1 - 3 - - 512 - 8192 - - - - - r0w0e0 - - - - - - r0w0e0 - wd0s1f - - 5 - 1390673920 - 2716160 - 235929600 - 460800 - - - - - r0w0e0 - wd0s1e - - 4 - 52428800 - 102400 - 183500800 - 358400 - - - - - r0w0e0 - wd0s1c - - 2 - 1626603520 - 3176960 - 0 - 0 - - - - - r0w0e0 - wd0s1b - - 1 - 104857600 - 204800 - 78643200 - 153600 - - - - - r0w0e0 - wd0s1a - - 0 - 78643200 - 153600 - 0 - 0 - - - - - - SIMDISK-class - - - wd0 - 1 - - - r0w0e0 - wd0 - - - - diff --git a/tools/regression/geom/ConfCmp/a2c.conf b/tools/regression/geom/ConfCmp/a2c.conf deleted file mode 100644 index 381c410..0000000 --- a/tools/regression/geom/ConfCmp/a2c.conf +++ /dev/null @@ -1,206 +0,0 @@ - - $FreeBSD$ - - DEV-class - - - wd0s1f - 4 - - - - r0w0e0 - - - - - wd0s1e - 4 - - - - r0w0e0 - - - - - wd0s1c - 4 - - - - r0w0e0 - - - - - wd0s1b - 4 - - - - - - - - wd0s1a - 4 - - - - r0w0e0 - - - - - wd0s1 - 3 - - - - r0w0e0 - - - - - wd0 - 2 - - - - r0w0e0 - - - - - PC98-class - - - wd0 - 2 - - 8704 - - - - - r0w0e0 - - - - - - r0w0e0 - wd0s1 - - 0 - 1626533888 - 3176824 - 69632 - 136 - - - - - - SUNLABEL-class - - - MBREXT-class - - - MBR-class - - - BSD-class - - - wd0s1 - 3 - - 512 - 8192 - - - - - r0w0e0 - - - - - - r0w0e0 - wd0s1f - - 5 - 1390673920 - 2716160 - 235929600 - 460800 - - - - - r0w0e0 - wd0s1e - - 4 - 52428800 - 102400 - 183500800 - 358400 - - - - - r0w0e0 - wd0s1c - - 2 - 1626603520 - 3176960 - 0 - 0 - - - - - r0w0e0 - wd0s1b - - 1 - 104857600 - 204800 - 78643200 - 153600 - - - - - r0w0e0 - wd0s1a - - 0 - 78643200 - 153600 - 0 - 0 - - - - - - SIMDISK-class - - - wd0 - 1 - - - r0w0e0 - wd0 - - - - diff --git a/tools/regression/geom/ConfCmp/a2d.conf b/tools/regression/geom/ConfCmp/a2d.conf deleted file mode 100644 index bccaed5..0000000 --- a/tools/regression/geom/ConfCmp/a2d.conf +++ /dev/null @@ -1,211 +0,0 @@ - - $FreeBSD$ - - DEV-class - - - wd0s1f - 4 - - - - r0w0e0 - - - - - wd0s1e - 4 - - - - r0w0e0 - - - - - wd0s1c - 4 - - - - r0w0e0 - - - - - wd0s1b - 4 - - - - r0w0e0 - - - - - wd0s1a - 4 - - - - r0w0e0 - - - - r0w0e0 - - - - - wd0s1 - 3 - - - - r0w0e0 - - - - - wd0 - 2 - - - - r0w0e0 - - - - - PC98-class - - - wd0 - 2 - - 8704 - - - - - r0w0e0 - - - - - - r0w0e0 - wd0s1 - - 0 - 1626533888 - 3176824 - 69632 - 136 - - - - - - SUNLABEL-class - - - MBREXT-class - - - MBR-class - - - BSD-class - - - wd0s1 - 3 - - 512 - 8192 - - - - - r0w0e0 - - - - - - r0w0e0 - wd0s1f - - 5 - 1390673920 - 2716160 - 235929600 - 460800 - - - - - r0w0e0 - wd0s1e - - 4 - 52428800 - 102400 - 183500800 - 358400 - - - - - r0w0e0 - wd0s1c - - 2 - 1626603520 - 3176960 - 0 - 0 - - - - - r0w0e0 - wd0s1b - - 1 - 104857600 - 204800 - 78643200 - 153600 - - - - - r0w0e0 - wd0s1a - - 0 - 78643200 - 153600 - 0 - 0 - - - - - - SIMDISK-class - - - wd0 - 1 - - - r0w0e0 - wd0 - - - - diff --git a/tools/regression/geom/Data/disk.alpha.da0.xml b/tools/regression/geom/Data/disk.alpha.da0.xml deleted file mode 100644 index 670fcc3..0000000 --- a/tools/regression/geom/Data/disk.alpha.da0.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - $FreeBSD$ - - Yet an alpha disklabel. - - 512 - 0 - 0 - 0 - 0 - - 0 - - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 574556820400000057444947544c202000000000000000000000000000000000 - 0000000000000000000200003f000000ff000000b2080000c13e00002eae2102 - 0000000000000000100e01000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000057455682a22908000020000000200000008007000000000000040000 - 07081600c05f20000080070000000000010000002eae21020000000000000000 - 000000000000000000000000000000000000000000a00000c0df270000040000 - 070818006e2ef901c07f28000004000007081600000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0e0000000000000001000000000000000000000000000000c51a45ca2ad1dba8 - - - diff --git a/tools/regression/geom/Data/disk.alpha2.da0.xml b/tools/regression/geom/Data/disk.alpha2.da0.xml deleted file mode 100644 index 5b341b1..0000000 --- a/tools/regression/geom/Data/disk.alpha2.da0.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - $FreeBSD$ - - alpha label which O'brien says blows up libdisk - - 512 - 0 - 0 - 0 - 0 - - 0 - - 5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a - 5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a - 5745568204000000000000000000000000000000000000000000000000000000 - 0000000000000000000200003f000000ff00000009020000c13e0000c9b67f00 - 0000000000000000100e01000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000005745568219cf0300002000000020000043bc0000c13e000000000000 - 08000000fc867c0004fb00000000000008000000c934020000827d0000000000 - 0100000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000000000000000000000005a5a5a5a5a5a5a5a5a5a5a5a - 5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a - 5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a - 5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a - 5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a - 9800000000000000020000000000000000000000000000007a13ad55a1c382b0 - - - diff --git a/tools/regression/geom/Data/disk.apple.xml b/tools/regression/geom/Data/disk.apple.xml deleted file mode 100644 index ecdd523..0000000 --- a/tools/regression/geom/Data/disk.apple.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - $FreeBSD$ - 512 - 366530560 - 0 - 0 - 0 - - 0 - - 45520200000aec68000100010000000000010000004000120001000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - - - - 512 - - 504d00000000000300000060000aec084d61634f530000000000000000000000 - 000000000000000000000000000000004170706c655f48465300000000000000 - 0000000000000000000000000000000000000000000aec08000000b700000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - - - - 1024 - - 504d000000000003000000010000003f4170706c650000000000000000000000 - 000000000000000000000000000000004170706c655f706172746974696f6e5f - 6d617000000000000000000000000000000000000000003f0000003700000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - - - - 1536 - - 504d00000000000300000040000000204d6163696e746f736800000000000000 - 000000000000000000000000000000004170706c655f44726976657234330000 - 0000000000000000000000000000000000000000000000200000007f00000000 - 000023ee0000000000000000000000000000000000007c083638303030000000 - 0000000000000000000106000000000000000001000700000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - - - diff --git a/tools/regression/geom/Data/disk.beast.da0.xml b/tools/regression/geom/Data/disk.beast.da0.xml deleted file mode 100644 index 96ad5f7..0000000 --- a/tools/regression/geom/Data/disk.beast.da0.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - $FreeBSD$ - alpha BSD label from beast.freebsd.org - - 512 - 0 - 0 - 0 - 0 - - 0 - - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 5745568204000000646130000000000000000000000000000000000000000000 - 0000000000000000000200003f000000ff0000000f020000c13e000000338100 - 0000000000000000100e01000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000057455682594e08000020000000200000002079000000000000040000 - 0708100000130800002079000000000001000000003381000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0f0000000000000001000000000000000000000000000000fc8c1983a904da83 - - - diff --git a/tools/regression/geom/Data/disk.critter.ad0.xml b/tools/regression/geom/Data/disk.critter.ad0.xml deleted file mode 100644 index 9e93b24..0000000 --- a/tools/regression/geom/Data/disk.critter.ad0.xml +++ /dev/null @@ -1,178 +0,0 @@ - - - - $FreeBSD$ - This image contains the MBR and disklabel sectors from my Asus M1300 - laptop. - - 512 - 0 - - 0 - - fc31c08ec08ed88ed0bc007cbe1a7cbf1a06b9e601f3a4e9008a31f6bbbe07b1 - 04382f74087f7885f6757489de80c310e2ef85f67502cd1880fa80720b8a3675 - 0480c68038f272028a1489e78a74018b4c02bb007c80feff753283f9ff752d51 - 53bbaa55b441cd13722081fb55aa751af6c10174155b666a0066ff740806536a - 016a1089e6b80042eb055b59b80102cd1389fc720f81bffe0155aa750cffe3be - bc06eb11bed406eb0cbef306eb07bb0700b40ecd10ac84c075f4ebfe496e7661 - 6c696420706172746974696f6e207461626c65004572726f72206c6f6164696e - 67206f7065726174696e672073797374656d004d697373696e67206f70657261 - 74696e672073797374656d000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000008001 - 0100a50fffff3f00000041295402000000000000000000000000000000000000 - 00000000000000000000000000000000000000000000000000000000000055aa - - - - 512 - - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - - - - 32768 - - 5745568205000000616430733100000000000000000000000000000000000000 - 0000000000000000000200003f0000001000000067970000f003000041295402 - 0000000000000000100e01000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000574556824fa608000020000000200000000020003f00000000040000 - 07081600000020003f0020000000000001000000412954023f00000000000000 - 00000000418984003fa0cf01000400000708160000a00f003f00400000040000 - 07081600000080003fa04f000004000007081600000060003fa0cf0000040000 - 070816000000a0003fa02f010004000007081600000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - - - - 64512 - - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - - - - 1073806336 - - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - - - - 1598094336 - - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - - - - 2147548160 - - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - - - - 2671836160 - - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffff00000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - - - diff --git a/tools/regression/geom/Data/disk.empty.flp.xml b/tools/regression/geom/Data/disk.empty.flp.xml deleted file mode 100644 index 88c603a..0000000 --- a/tools/regression/geom/Data/disk.empty.flp.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - $FreeBSD$ - An empty floppy disk - - 512 - 1474560 - 18 - 2 - 80 - diff --git a/tools/regression/geom/Data/disk.far.ad0.xml b/tools/regression/geom/Data/disk.far.ad0.xml deleted file mode 100644 index 0a8d3ca..0000000 --- a/tools/regression/geom/Data/disk.far.ad0.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - $FreeBSD$ - A Windows laptop. - - 512 - 0 - - 0 - - 33c08ed0bc007cfb5007501ffcbe1b7cbf1b065057b9e501f3a4cbbebe07b104 - 382c7c09751583c610e2f5cd188b148bee83c610497416382c74f6be10074eac - 3c0074fabb0700b40ecd10ebf2894625968a4604b4063c0e7411b40b3c0c7405 - 3ac4752b40c64625067524bbaa5550b441cd1358721681fb55aa7510f6c10174 - 0b8ae0885624c706a106eb1e886604bf0a00b801028bdc33c983ff057f038b4e - 25034e02cd137229be4607813efe7d55aa745a83ef057fda85f67583be2707eb - 8a9891529903460813560ae812005aebd54f74e433c0cd13ebb8000080093521 - 5633f656565250065351be1000568bf45052b800428a5624cd135a588d641072 - 0a4075014280c702e2f7f85ec3eb74496e76616c696420706172746974696f6e - 207461626c65004572726f72206c6f6164696e67206f7065726174696e672073 - 797374656d004d697373696e67206f7065726174696e672073797374656d0000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000008bfc1e578bf5cb00000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 0100a05304263f00000092d80800805401260befbf730cd90800340a88000000 - 00000000000000000000000000000000000000000000000000000000000055aa - - - - 512 - - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - - - diff --git a/tools/regression/geom/Data/disk.flat.da1.xml b/tools/regression/geom/Data/disk.flat.da1.xml deleted file mode 100644 index 2302a7c..0000000 --- a/tools/regression/geom/Data/disk.flat.da1.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - $FreeBSD$ - This image contains an interesting setup: there is an MBR+BSD - but also another BSD at sector one which is valid but bogus. - - 512 - 0 - 0 - 0 - 0 - - 0 - - fc31c08ec08ed88ed0bc007cbe1a7cbf1a06b9e601f3a4e9008a31f6bbbe07b1 - 04382f74087f7885f6757489de80c310e2ef85f67502cd1880fa80720b8a3675 - 0480c68038f272028a1489e78a74018b4c02bb007c80feff753283f9ff752d51 - 53bbaa55b441cd13722081fb55aa751af6c10174155b666a0066ff740806536a - 016a1089e6b80042eb055b59b80102cd1389fc720f81bffe0155aa750cffe3be - bc06eb11bed406eb0cbef306eb07bb0700b40ecd10ac84c075f4ebfe496e7661 - 6c696420706172746974696f6e207461626c65004572726f72206c6f6164696e - 67206f7065726174696e672073797374656d004d697373696e67206f70657261 - 74696e672073797374656d000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000008001 - 0100a5feffff3f0000003a612302000000000000000000000000000000000000 - 00000000000000000000000000000000000000000000000000000000000055aa - - - - 512 - - 5745568204000000534541474154452053543331383433360000000000000000 - 000000000000000000020000000800000100000072440000000800000004fb00 - 0000000000000000100e01000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000057455682e29908000020000000200000002001000000000000040000 - 07081000000008000020010000000000010000000004fb000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000e0f100002009000004000007081000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - - - - 32256 - - eb1b9090161f666a005150065331c088f0506a1089e5e8c7008d6610cbfc31c9 - 8ec18ed98ed1bc007c89e6bf0007fec5f3a5beee7d80fa80722cb601e86700b9 - 0100bebe8db601807c04a57507e319f60480751483c610fec680fe0572e949e3 - e1be8b7deb5231d289160009b610e83500bb00908b770a01debf00b0b900ac29 - f1f3a429f930c0f3aae80300e98113fae464a80275fab0d1e664e464a80275fa - b0dfe660fbc3bb008c8b44088b4c0a0ee853ff732abe867de81c00be907de816 - 0030e4cd16c70672043412ea0000ffffbb0700b40ecd10ac84c075f4b401f9c3 - 52b408cd1388f55a72f580e13f74edfa668b460852660fb6d96631d266f7f388 - eb88d54330d266f7f388d75a663dff030000fb774486c4c0c80208e8409188fe - 28e08a660238e0720288e0bf0500c45e0450b402cd135b730a4f741c30e4cd13 - 93ebeb0fb6c30146087303ff460ad0e3005e052846027788c32ef6069908800f - 8479ffbbaa5552b441cd135a0f826fff81fb55aa0f8564fff6c1010f845dff89 - eeb442cd13c35265616400426f6f7400206572726f720d0a0080909090909090 - 9090909090909090909090909090909090909090909090909090909090900000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000080000100a5ffffff0000000050c3000055aa - - - - 32768 - - 5745568204000000646131733100000000000000000000000000000000000000 - 0000000000000000000200003f000000ff000000b8080000c13e00003a612302 - 0000000000000000100e01000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000005745568233c408000020000000200000000000000000000000000000 - 0000000000800c003f800c0000000000010000003a6123023f00000000000000 - 000000000000000000000000000000000000000000800c003f00000000040000 - 07081600000020003f00190000040000070816003a61ea013f00390000040000 - 0708160000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - - - diff --git a/tools/regression/geom/Data/disk.kern.flp.xml b/tools/regression/geom/Data/disk.kern.flp.xml deleted file mode 100644 index 6640c48..0000000 --- a/tools/regression/geom/Data/disk.kern.flp.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - $FreeBSD$ - A FreeBSD kern.flp image. - - 512 - 0 - - 0 - - eb1b9090161f666a005150065331c088f0506a1089e5e8c7008d6610cbfc31c9 - 8ec18ed98ed1bc007c89e6bf0007fec5f3a5beee7d80fa80722cb601e86700b9 - 0100bebe8db601807c04a57507e319f60480751483c610fec680fe0572e949e3 - e1be8b7deb5231d289160009b610e83500bb00908b770a01debf00b0b900ac29 - f1f3a429f930c0f3aae80300e98113fae464a80275fab0d1e664e464a80275fa - b0dfe660fbc3bb008c8b44088b4c0a0ee853ff732abe867de81c00be907de816 - 0030e4cd16c70672043412ea0000ffffbb0700b40ecd10ac84c075f4b401f9c3 - 52b408cd1388f55a72f580e13f74edfa668b460852660fb6d96631d266f7f388 - eb88d54330d266f7f388d75a663dff030000fb774486c4c0c80208e8409188fe - 28e08a660238e0720288e0bf0500c45e0450b402cd135b730a4f741c30e4cd13 - 93ebeb0fb6c30146087303ff460ad0e3005e052846027788c32ef6069908800f - 8479ffbbaa5552b441cd135a0f826fff81fb55aa0f8564fff6c1010f845dff89 - eeb442cd13c35265616400426f6f7400206572726f720d0a0080909090909090 - 9090909090909090909090909090909090909090909090909090909090900000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000080000100a5ffffff0000000050c3000055aa - - - - 512 - - 5745568200000000666431343430000000000000000000000000000000000000 - 00000000000000000002000012000000020000005000000024000000400b0000 - 00000000000000002c0101000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000057455682286903000020000000200000400b00000000000000020000 - 00080000400b0000000000000002000000080000400b00000000000000020000 - 0708060000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - - - diff --git a/tools/regression/geom/Data/disk.msdos.ext.xml b/tools/regression/geom/Data/disk.msdos.ext.xml deleted file mode 100644 index 868a88f7..0000000 --- a/tools/regression/geom/Data/disk.msdos.ext.xml +++ /dev/null @@ -1,534 +0,0 @@ - - - - $FreeBSD$ - A MSDOS 6.22 disk with maximal number of extended partitions. - - 512 - 0 - - 0 - - fa33c08ed0bc007c8bf45007501ffbfcbf0006b90001f2a5ea1d060000bebe07 - b304803c80740e803c00751c83c610fecb75efcd188b148b4c028bee83c610fe - cb741a803c0074f4be8b06ac3c00740b56bb0700b40ecd105eebf0ebfebf0500 - bb007cb8010257cd135f730c33c0cd134f75edbea306ebd3bec206bffe7d813d - 55aa75c78bf5ea007c0000496e76616c696420706172746974696f6e20746162 - 6c65004572726f72206c6f6164696e67206f7065726174696e67207379737465 - 6d004d697373696e67206f7065726174696e672073797374656d000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000008001 - 010006fe7f043f00000086fa3f000000410505fe7f38c5fa3f0034bf0c000000 - 00000000000000000000000000000000000000000000000000000000000055aa - - - - 512 - - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - - - - 2146798080 - - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 410501fe7f053f000000823e00000000410605fe7f06c13e0000c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - - - - 2155023360 - - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 410601fe7f063f000000823e00000000410705fe7f07827d0000c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - - - - 2163248640 - - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 410701fe7f073f000000823e00000000410805fe7f0843bc0000c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - - - - 2171473920 - - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 410801fe7f083f000000823e00000000410905fe7f0904fb0000c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - - - - 2179699200 - - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 410901fe7f093f000000823e00000000410a05fe7f0ac5390100c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - - - - 2187924480 - - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 410a01fe7f0a3f000000823e00000000410b05fe7f0b86780100c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - - - - 2196149760 - - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 410b01fe7f0b3f000000823e00000000410c05fe7f0c47b70100c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - - - - 2204375040 - - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 410c01fe7f0c3f000000823e00000000410d05fe7f0d08f60100c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - - - - 2212600320 - - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 410d01fe7f0d3f000000823e00000000410e05fe7f0ec9340200c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - - - - 2220825600 - - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 410e01fe7f0e3f000000823e00000000410f05fe7f0f8a730200c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - - - - 2229050880 - - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 410f01fe7f0f3f000000823e00000000411005fe7f104bb20200c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - - - - 2237276160 - - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 411001fe7f103f000000823e00000000411105fe7f110cf10200c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - - - - 2245501440 - - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 411101fe7f113f000000823e00000000411205fe7f12cd2f0300c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - - - - 2253726720 - - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 411201fe7f123f000000823e00000000411305fe7f138e6e0300c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - - - - 2261952000 - - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 411301fe7f133f000000823e00000000411405fe7f144fad0300c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - - - - 2270177280 - - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 411401fe7f143f000000823e00000000411505fe7f1510ec0300c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - - - - 2278402560 - - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 411501fe7f153f000000823e00000000411605fe7f16d12a0400c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - - - - 2286627840 - - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 411601fe7f163f000000823e00000000411705fe7f1792690400c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - - - - 2294853120 - - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 411701fe7f173f000000823e00000000411805fe7f1853a80400c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - - - - 2303078400 - - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 411801fe7f183f000000823e00000000411905fe7f1914e70400c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - - - - 2311303680 - - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 411901fe7f193f000000823e00000000411a05fe7f1ad5250500c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - - - - 2319528960 - - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 411a01fe7f1a3f000000823e00000000411b05fe7f1b96640500c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - - - - 2327754240 - - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 411b01fe7f1b3f000000823e0000000000000000000000000000000000000000 - 00000000000000000000000000000000000000000000000000000000000055aa - - - diff --git a/tools/regression/geom/Data/disk.msdos.flp.xml b/tools/regression/geom/Data/disk.msdos.flp.xml deleted file mode 100644 index d057d1a..0000000 --- a/tools/regression/geom/Data/disk.msdos.flp.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - $FreeBSD$ - A MSDOS floppy image. - - 512 - 0 - - 0 - - eb3c904d53444f53352e30000201010002e000400bf009001200020000000000 - 0000000000002911053b114e4f204e414d45202020204641543132202020fa33 - c08ed0bc007c1607bb780036c5371e561653bf3e7cb90b00fcf3a4061fc645fe - 0f8b0e187c884df9894702c7073e7cfbcd13727933c03906137c74088b0e137c - 890e207ca0107cf726167c03061c7c13161e7c03060e7c83d200a3507c891652 - 7ca3497c89164b7cb82000f726117c8b1e0b7c03c348f7f30106497c83164b7c - 00bb00058b16527ca1507ce89200721db001e8ac0072168bfbb90b00bee67df3 - a6750a8d7f20b90b00f3a67418be9e7de85f0033c0cd165e1f8f048f4402cd19 - 585858ebe88b471a48488a1e0d7c32fff7e30306497c13164b7cbb0007b90300 - 505251e83a0072d8b001e85400595a5872bb05010083d200031e0b7ce2e28a2e - 157c8a16247c8b1e497ca14b7cea00007000ac0ac07429b40ebb0700cd10ebf2 - 3b16187c7319f736187cfec288164f7c33d2f7361a7c8816257ca34d7cf8c3f9 - c3b4028b164d7cb106d2e60a364f7c8bca86e98a16247c8a36257ccd13c30d0a - 4e6f6e2d53797374656d206469736b206f72206469736b206572726f720d0a52 - 65706c61636520616e6420707265737320616e79206b6579207768656e207265 - 6164790d0a00494f2020202020205359534d53444f53202020535953000055aa - - - - 512 - - f0ffff03400005600007800009a0000bc0000de0000f00011120011340011560 - 0117800119a0011bc0011de0011f000221200223400225600227800229a0022b - c0022de0022f000331200333400335600337800339a0033bc0033de0033f0004 - 41200443400445600447800449a0044bc0044de0044f000551f0ff5340055560 - 0557800559a0055bc0055de0055f000661200663400665600667800669a0066b - c0066de0066f000771200773400775600777800779a0077bc0077de0077f0008 - 81200883400885600887800889a0088bc0088de0088f00099120099340099560 - 0997800999a0099bc009ffef099f000aa1200aa3400aa5600aa7800aa9a00aab - c00aade00aaf000bb1200bb3400bb5600bb7800bb9a00bbbc00bbde00bbf000c - c1200cc3400cc5600cc7800cc9a00ccbc00ccde00ccf000dd1200dd3400dd560 - 0dd7800dd9a00ddbc00ddde00ddf000ee1200ee3400ee5600ee7800ee9a00eeb - c00eede00eef000ff1200ff3400ff5600ff7800ff9a00ffbc00ffde00fff0010 - 01211003411005611007f1ff09a1100bc1100de1100f01111121111341111561 - 1117811119a1111bc1111de1111f011221211223411225611227811229a1122b - c1122de1122f011331211333411335611337811339a1133bc1133de1133f0114 - 41211443411445611447811449a1144bc1144de1144f01155121155341155561 - - - diff --git a/tools/regression/geom/Data/disk.pc98.wdc0.xml b/tools/regression/geom/Data/disk.pc98.wdc0.xml deleted file mode 100644 index 6bae97f..0000000 --- a/tools/regression/geom/Data/disk.pc98.wdc0.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - $FreeBSD$ - - A PC98 disklabel from Warner - - 512 - 0 - 17 - 8 - 0 - - 0 - - e9fd009049504c310000001ea08405b48ecd1ba820742232dbb414cd1b721a80 - fb847515e896007303eb6b90b424bb0004b93012ba4001cd1bbb0001b484cd1b - b40633c933d2508cc82dc0038ec05833edcd1b7241b406ba010081c50008cd1b - 7234ba0400f7c300aa7403ba0200b406bb001c81c50008cd1b721b508bc5b104 - d3e88cc103c18bf058e815002e89360a002eff1e0800e80800b40ecd1bb90100 - cb56a0840532dbb414cd1b720e80fb8475092ec606d40000e802005ec3b4b0be - d000ba06001e0e1fcd1bb4b0cd1b1fc31e000000010000000000000000000000 - 000000000000000000000000000000000000000000000000000000000d0055aa - fa601e066800d81f33f6b51e813c8b46750e817c0204eb7507817c05b4007405 - 46e2e9eb6032ff8a5c040358f18d7c03be9a012e015c03b00cba6104eeb002ba - 3d05ee68009807b95b00f32ea4b9ff0f33f633d226ad02f402d0e2f8f6def6da - 268914b416b3c2e4f0a840750680cc2080cb048ac3ba3f04ee8ac4ba3d05eeb0 - 08ba6104ee071f612ec7060000eb0a2ec70602009090fbe966fec390e8ebffb9 - 21007402b1118bc1f6660702460612e5912ef66703f7660403c183d200c3fec2 - 26881605205926880e0a20c390909090905191b81100502ef6670291f7f126a3 - 0220599233d2f7f12680260420f02608060420ebc9000000000080010d0055aa - - - - 512 - - 94c4000000000100000001000000405b46726565425344000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - - - - 70144 - - 5745568205000000776430733100000000000000000000000000000000000000 - 0000000000000000000200001100000008000000415b000088000000887a3000 - 0000000000000000100e01000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000005745568295f208000020000000200000005802008800000000000000 - 0700000000200300885802000000000001000000007a30008800000000000000 - 0000000000000000000000000000000000000000009001008878050000000000 - 0700000000722900880807000000000007000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - - - diff --git a/tools/regression/geom/Data/disk.sun.da0.xml b/tools/regression/geom/Data/disk.sun.da0.xml deleted file mode 100644 index 826581f..0000000 --- a/tools/regression/geom/Data/disk.sun.da0.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - $FreeBSD$ - A Solaris 8 disklabel - - 512 - 0 - 0 - 0 - 0 - - 0 - - 49424d2d444459532d5433363935304d2d533936482063796c20313439373020 - 616c742032206864203132207365632033393900000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000100000000000000000008000200000003000100050000000000000000 - 0000000000000000000000080000003f000000000000000000000000600ddeee - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000027103a7c00000000000000013a7a0002000c018f00000000000000dc - 002d96c000000000001012b0000000000445b1c8000000000000000000000000 - 00000000000000000000000000000000000000000000034c04080858dabe5ec8 - - - diff --git a/tools/regression/geom/Data/disk.sun.da1.xml b/tools/regression/geom/Data/disk.sun.da1.xml deleted file mode 100644 index 0aac8e5..0000000 --- a/tools/regression/geom/Data/disk.sun.da1.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - $FreeBSD$ - A Solaris 8 disklabel - - 512 - 0 - 0 - 0 - 0 - - 0 - - 53554e3138472063796c203735303620616c7420322068642031392073656320 - 3234380000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000170686b00000000000008000200000003000100050000000800010000 - 00000007000000040000000800000000000000000000000000000000600ddeee - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000001c201d5400000000000000011d520002001300f80000000000000000 - 0007d6480000006d0020113000000000021bad5000000b4e014b873800000000 - 000000000000022b00400ff8000005a600400ff80000092100280c48dabe971e - - - diff --git a/tools/regression/geom/Data/disk.typo.ad0.xml b/tools/regression/geom/Data/disk.typo.ad0.xml deleted file mode 100644 index 56383ab..0000000 --- a/tools/regression/geom/Data/disk.typo.ad0.xml +++ /dev/null @@ -1,219 +0,0 @@ - - - - $FreeBSD$ - A multislice FreeBSD disk - - 512 - 0 - - 0 - - fc31c08ec08ed88ed0bc007cbd000a89efb108f3abfe45f252bb000689eeb802 - 02e82e015ae9008af686bbfd20750484d278048a96bafd885600e8fc0052bbc2 - 0731d2886ffc0fa396bbfd731c8a07bf0f08b103f2ae7411b10df2ae750481c7 - 0d008a0d01cfe8c1004280c31073d4582c7f3a067504720548740e30c004b088 - 86b8fdbfb207e8a100be0308e8ad008a96b9fd4ee8880030e4cd1a89d703bebc - fdb401cd16751330e4cd1a39fa72f28a86b9fdeb15b007e88e0030e4cd1688e0 - 3c1c74eb2c3b3c0477eb980fa3460c73e48886b9fdbe000a8a1489f33c049c74 - 0ac0e00405be0793c6078053f686bbfd407509bb0006b80103e856005e9d7507 - 8a96b8fd80ea30bb007cb80102e8420072a381bffe0155aa759be81c00ffe3b0 - 46e82400b03100d0eb170fab560cbe0008e8ebff89fee80300be0d08aca88075 - 05e80400ebf6247f53bb0700b40ecd105bc38a74018b4c025689e780feff7540 - 83f9ff753bf686bbfd8074345153bbaa5550b441cd1358720e81fb55aa7508f6 - c101740380cc405b59f6c4407412666a0066ff740806536a006a1089e6864402 - cd1389fc5ec39090909090909090909001014472697665200000808fb6008001 - 0100a5ef7f9f3f000000c1f95f00000041a0a5efffff00fa5f0050e29f0000ff - ffffa5efffff50dcff0050dcff000000000000000000000000000000000055aa - - - - 512 - - 2020a00a44656661756c743aa00d8a00050f010406070b0c0e6383a5a6a9b70e - 141312141d1c1b2124282e3439556e6b6e6f77ee444fd357696e646f7773204e - d457696e646f77f3554e49d84c696e75f8467265654253c44f70656e4253c44e - 65744253c44253442f4fd3000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - - - - 32768 - - 5745568205000000616430733100000000000000000000000000000000000000 - 0000000000000000000200003f000000f0000000180a0000103b000080295402 - 0000000000000000100e01000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000005745568204c108000020000000200000002003003f00000000000000 - 0700000000a00f003f2003000000000001000000c1f95f003f00000000000000 - 000000000000000000000000000000000000000000a00f003fc0120000000000 - 07000000c1993d003f6022000000000007000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - - - - 64512 - - 0000007c0000010002000400f8ff0000000400f8000000000000000000000004 - 0000004000000008000000000010007e00800000070000fe1f00000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - - - - 104922112 - - 3310f30d0350fbf66f44ebd906c9963d46b2bf609bb753131e7c24cf9ed194ce - a59117b612772b207ddcb753df72456f98d0cac567f60526c7b9308afd87e657 - dd45b3d1eb075b6820aa6ea5a0f10511f65a257f0d7d89d88e189bef43786ff5 - a0316511a7a07168f2ef001e71fbc56dd8ddc7866c4856dc979742be22f4badd - e1fcba7aebe4b5f4bb8b0c89e84de59f0ba48d7a8b00bb1797fc057e3d3d8058 - 4b1987ac49b74bed74cb4985850d5be64e8188d40ad0323165b355c512a91523 - 5d5211eeb021c754f552b160f9a73c4c5e59370163cf531ca0382cc462f9ac9d - 35612380f7a5d9d5e3bde129ef6fab02347088025d0937fb6c56dc68c283ce9d - 1cfc5b3c7ad1f52faeae05188386cb57cb88c5dccaa2db17a09420ae7d9f9d6e - 058370711f445cff4d4543ee9f0c3054400116304018f68d9c08d05b04680162 - 23172b8b1775157790fe5e5100c530e3377d383a0080468b0125e87e8d7dee5f - 46030a238dc8a0000cb4eafc6ad4735f2c16d1642e3834aefbb5bfc25fcc0062 - 3a89410ab88839e3ed151cd6bc2b5704c5db4c9fc39662bd3a41347212c664be - 04684e551c0a0362bb3139a460a7c8d178c349a47d724b7d456606b2f47a8d99 - d4af7998148ed93443a828ece96cdb7eb158a21189ed1527bdad7b18b74f168b - d01fcfde994977174e41ad8f6ea19fac8bb95e5d68643d0457d746cf32531639 - - - - 629210112 - - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - - - - 1153498112 - - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - - - - 3220439552 - - 5745568205000000616430733200000000000000000000000000000000000000 - 0000000000000000000200003f000000f0000000180a0000103b000080295402 - 0000000000000000100e01000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000057455682fc1908000020000000200000000000000000000000000000 - 000000000000000000000000000000000000000050e29f0000fa5f0000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - - - - 6440878080 - - 0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a - 0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a - 0a0a0a0a0a0a0a0a0a0a0a0a3c4120200a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a - 0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a - 0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a - 0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a - 0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a687265663d22687474703a2f2f777777 - 2e706c6179626f7973746f72652e636f6d2f70626c696e6b2e6367693f616666 - 696c696174653d4d4f3130303030303034353426736b753d4249303130362220 - 7461726765743d225f626c616e6b22206f6e6d6f7573656f7665723d22706172 - 656e742e77696e646f772e7374617475733d27506c6179626f792053746f7265 - 273b2072657475726e2074727565223e3c494d47207372633d22687474703a2f - 2f61313833322e672e616b2e706c6179626f792e636f6d2f372f313833322f32 - 332f3939303232313437302f7777772e706c6179626f792e636f6d2f6d616761 - 7a696e652f63757272656e742f696d782f636f7665725f696e6465782e6a7067 - 2220616c69676e3d72696768742077696474683d223135302220686569676874 - - - - 8585257472 - - 5745568205000000616430733300000000000000000000000000000000000000 - 0000000000000000000200003f000000f000000055040000103b000050dcff00 - 0000000000000000100e01000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000057455682bcbd0800002000000020000000803e0050dcff0000040000 - 070816000000000000000000000000000000000050dcff0050dcff0000000000 - 00000000505cc100505c3e010010000007049f00000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - - - diff --git a/tools/regression/geom/MdLoad/Makefile b/tools/regression/geom/MdLoad/Makefile deleted file mode 100644 index eab3f89..0000000 --- a/tools/regression/geom/MdLoad/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# $FreeBSD$ - -PROG= MdLoad -DPADD= ${LIBSBUF} ${LIBBSDXML} -LDADD= -lsbuf -lbsdxml - -MAN= - - -WARNS?= 4 -.include "bsd.prog.mk" - -test: ${PROG} - ./${PROG} md34 ../Data/disk.critter.ad0.xml diff --git a/tools/regression/geom/MdLoad/MdLoad.c b/tools/regression/geom/MdLoad/MdLoad.c deleted file mode 100644 index 33ee4de..0000000 --- a/tools/regression/geom/MdLoad/MdLoad.c +++ /dev/null @@ -1,271 +0,0 @@ -/*- - * Copyright (c) 2003 Poul-Henning Kamp - * Copyright (c) 2002 Networks Associates Technology, Inc. - * All rights reserved. - * - * This software was developed for the FreeBSD Project by Poul-Henning Kamp - * and NAI Labs, the Security Research Division of Network Associates, Inc. - * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the - * DARPA CHATS research program. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The names of the authors may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -struct sector { - LIST_ENTRY(sector) sectors; - off_t offset; - unsigned char *data; -}; - -struct simdisk_softc { - int sectorsize; - off_t mediasize; - off_t lastsector; - LIST_HEAD(,sector) sectors; - struct sbuf *sbuf; - struct sector *sp; - u_int fwsectors; - u_int fwheads; - u_int fwcylinders; -}; - -static void -g_simdisk_insertsector(struct simdisk_softc *sc, struct sector *dsp) -{ - struct sector *dsp2, *dsp3; - - if (sc->lastsector < dsp->offset) - sc->lastsector = dsp->offset; - if (LIST_EMPTY(&sc->sectors)) { - LIST_INSERT_HEAD(&sc->sectors, dsp, sectors); - return; - } - dsp3 = NULL; - LIST_FOREACH(dsp2, &sc->sectors, sectors) { - dsp3 = dsp2; - if (dsp2->offset > dsp->offset) { - LIST_INSERT_BEFORE(dsp2, dsp, sectors); - return; - } - } - LIST_INSERT_AFTER(dsp3, dsp, sectors); -} - -static void -startElement(void *userData, const char *name, const char **atts __unused) -{ - struct simdisk_softc *sc; - - sc = userData; - if (!strcasecmp(name, "sector")) { - sc->sp = calloc(1, sizeof(*sc->sp) + sc->sectorsize); - sc->sp->data = (u_char *)(sc->sp + 1); - } - sbuf_clear(sc->sbuf); -} - -static void -endElement(void *userData, const char *name) -{ - struct simdisk_softc *sc; - char *p; - u_char *q; - int i, j; - off_t o; - - sc = userData; - - if (!strcasecmp(name, "comment")) { - sbuf_clear(sc->sbuf); - return; - } - sbuf_finish(sc->sbuf); - if (!strcasecmp(name, "sectorsize")) { - sc->sectorsize = strtoul(sbuf_data(sc->sbuf), &p, 0); - if (*p != '\0') - errx(1, "strtoul croaked on sectorsize"); - } else if (!strcasecmp(name, "mediasize")) { - o = strtoull(sbuf_data(sc->sbuf), &p, 0); - if (*p != '\0') - errx(1, "strtoul croaked on mediasize"); - if (o > 0) - sc->mediasize = o; - } else if (!strcasecmp(name, "fwsectors")) { - sc->fwsectors = strtoul(sbuf_data(sc->sbuf), &p, 0); - if (*p != '\0') - errx(1, "strtoul croaked on fwsectors"); - } else if (!strcasecmp(name, "fwheads")) { - sc->fwheads = strtoul(sbuf_data(sc->sbuf), &p, 0); - if (*p != '\0') - errx(1, "strtoul croaked on fwheads"); - } else if (!strcasecmp(name, "fwcylinders")) { - sc->fwcylinders = strtoul(sbuf_data(sc->sbuf), &p, 0); - if (*p != '\0') - errx(1, "strtoul croaked on fwcylinders"); - } else if (!strcasecmp(name, "offset")) { - sc->sp->offset= strtoull(sbuf_data(sc->sbuf), &p, 0); - if (*p != '\0') - errx(1, "strtoul croaked on offset"); - } else if (!strcasecmp(name, "fill")) { - j = strtoul(sbuf_data(sc->sbuf), NULL, 16); - memset(sc->sp->data, j, sc->sectorsize); - } else if (!strcasecmp(name, "hexdata")) { - q = sc->sp->data; - p = sbuf_data(sc->sbuf); - for (i = 0; i < sc->sectorsize; i++) { - if (!isxdigit(*p)) - errx(1, "I croaked on hexdata %d:(%02x)", i, *p); - if (isdigit(*p)) - j = (*p - '0') << 4; - else - j = (tolower(*p) - 'a' + 10) << 4; - p++; - if (!isxdigit(*p)) - errx(1, "I croaked on hexdata %d:(%02x)", i, *p); - if (isdigit(*p)) - j |= *p - '0'; - else - j |= tolower(*p) - 'a' + 10; - p++; - *q++ = j; - } - } else if (!strcasecmp(name, "sector")) { - g_simdisk_insertsector(sc, sc->sp); - sc->sp = NULL; - } else if (!strcasecmp(name, "diskimage")) { - } else if (!strcasecmp(name, "FreeBSD")) { - } else { - printf("<%s>[[%s]]\n", name, sbuf_data(sc->sbuf)); - } - sbuf_clear(sc->sbuf); -} - -static void -characterData(void *userData, const XML_Char *s, int len) -{ - const char *b, *e; - struct simdisk_softc *sc; - - sc = userData; - b = s; - e = s + len - 1; - while (isspace(*b) && b < e) - b++; - while (isspace(*e) && e > b) - e--; - if (e != b || !isspace(*b)) - sbuf_bcat(sc->sbuf, b, e - b + 1); -} - -static struct simdisk_softc * -g_simdisk_xml_load(const char *file) -{ - XML_Parser parser = XML_ParserCreate(NULL); - struct stat st; - char *p; - struct simdisk_softc *sc; - int fd, i; - - sc = calloc(1, sizeof *sc); - sc->sbuf = sbuf_new_auto(); - LIST_INIT(&sc->sectors); - XML_SetUserData(parser, sc); - XML_SetElementHandler(parser, startElement, endElement); - XML_SetCharacterDataHandler(parser, characterData); - - fd = open(file, O_RDONLY); - if (fd < 0) - err(1, file); - fstat(fd, &st); - p = mmap(NULL, st.st_size, PROT_READ, MAP_NOCORE|MAP_PRIVATE, fd, 0); - i = XML_Parse(parser, p, st.st_size, 1); - if (i != 1) - errx(1, "XML_Parse complains: return %d", i); - munmap(p, st.st_size); - close(fd); - XML_ParserFree(parser); - return (sc); -} - -int -main(int argc, char **argv) -{ - struct simdisk_softc *sc; - char buf[BUFSIZ]; - int error, fd; - struct sector *dsp; - - if (argc != 3) - errx(1, "Usage: %s mddevice xmlfile", argv[0]); - - sc = g_simdisk_xml_load(argv[2]); - if (sc->mediasize == 0) - sc->mediasize = sc->lastsector + sc->sectorsize * 10; - if (sc->sectorsize == 0) - sc->sectorsize = 512; - sprintf(buf, "mdconfig -a -t malloc -s %jd -S %d", - (intmax_t)sc->mediasize / sc->sectorsize, sc->sectorsize); - if (sc->fwsectors && sc->fwheads) - sprintf(buf + strlen(buf), " -x %d -y %d", - sc->fwsectors, sc->fwheads); - sprintf(buf + strlen(buf), " -u %s", argv[1]); - error = system(buf); - if (error) - return (error); - fd = open(argv[1], O_RDWR); - if (fd < 0 && errno == ENOENT) { - sprintf(buf, "%s%s", _PATH_DEV, argv[1]); - fd = open(buf, O_RDWR); - } - if (fd < 0) - err(1, "Could not open %s", argv[1]); - LIST_FOREACH(dsp, &sc->sectors, sectors) { - lseek(fd, dsp->offset, SEEK_SET); - error = write(fd, dsp->data, sc->sectorsize); - if (error != sc->sectorsize) - err(1, "write sectordata failed"); - } - close(fd); - exit (0); -} diff --git a/tools/regression/geom/Ref/disk.alpha.da0.xml b/tools/regression/geom/Ref/disk.alpha.da0.xml deleted file mode 100644 index a300f0d..0000000 --- a/tools/regression/geom/Ref/disk.alpha.da0.xml +++ /dev/null @@ -1,7 +0,0 @@ -$FreeBSD$ -/dev/md34 512 5120 10 -/dev/md34a 512 251658240 491520 -/dev/md34b 512 1086291968 2121664 -/dev/md34c 512 18309995520 35761710 -/dev/md34e 512 20971520 40960 -/dev/md34f 512 16951073792 33107566 diff --git a/tools/regression/geom/Ref/disk.alpha2.da0.xml b/tools/regression/geom/Ref/disk.alpha2.da0.xml deleted file mode 100644 index 7ef7573..0000000 --- a/tools/regression/geom/Ref/disk.alpha2.da0.xml +++ /dev/null @@ -1,5 +0,0 @@ -$FreeBSD$ -/dev/md34 512 5120 10 -/dev/md34a 512 24675840 48195 -/dev/md34b 512 4178442240 8161020 -/dev/md34c 512 74027520 144585 diff --git a/tools/regression/geom/Ref/disk.apple.xml b/tools/regression/geom/Ref/disk.apple.xml deleted file mode 100644 index a2a0f98..0000000 --- a/tools/regression/geom/Ref/disk.apple.xml +++ /dev/null @@ -1,5 +0,0 @@ -$FreeBSD$ -/dev/md34 512 366530560 715880 -/dev/md34s1 512 366481408 715784 -/dev/md34s2 512 32256 63 -/dev/md34s3 512 16384 32 diff --git a/tools/regression/geom/Ref/disk.beast.da0.xml b/tools/regression/geom/Ref/disk.beast.da0.xml deleted file mode 100644 index b6aa32e..0000000 --- a/tools/regression/geom/Ref/disk.beast.da0.xml +++ /dev/null @@ -1,5 +0,0 @@ -$FreeBSD$ -/dev/md34 512 5120 10 -/dev/md34a 512 4064280576 7938048 -/dev/md34b 512 270925824 529152 -/dev/md34c 512 4335206400 8467200 diff --git a/tools/regression/geom/Ref/disk.critter.ad0.xml b/tools/regression/geom/Ref/disk.critter.ad0.xml deleted file mode 100644 index 0620bfe..0000000 --- a/tools/regression/geom/Ref/disk.critter.ad0.xml +++ /dev/null @@ -1,11 +0,0 @@ -$FreeBSD$ -/dev/md34 512 2671841280 5218440 -/dev/md34s1 512 20003848704 39070017 -/dev/md34s1a 512 1073741824 2097152 -/dev/md34s1b 512 1073741824 2097152 -/dev/md34s1c 512 20003848704 39070017 -/dev/md34s1d 512 4447175168 8685889 -/dev/md34s1e 512 524288000 1024000 -/dev/md34s1f 512 4294967296 8388608 -/dev/md34s1g 512 3221225472 6291456 -/dev/md34s1h 512 5368709120 10485760 diff --git a/tools/regression/geom/Ref/disk.empty.flp.xml b/tools/regression/geom/Ref/disk.empty.flp.xml deleted file mode 100644 index 659b416..0000000 --- a/tools/regression/geom/Ref/disk.empty.flp.xml +++ /dev/null @@ -1,2 +0,0 @@ -$FreeBSD$ -/dev/md34 512 1474560 2880 80 2 18 diff --git a/tools/regression/geom/Ref/disk.far.ad0.xml b/tools/regression/geom/Ref/disk.far.ad0.xml deleted file mode 100644 index 629816a..0000000 --- a/tools/regression/geom/Ref/disk.far.ad0.xml +++ /dev/null @@ -1,4 +0,0 @@ -$FreeBSD$ -/dev/md34 512 5632 11 -/dev/md34s1 512 296821760 579730 -/dev/md34s2 512 4564740096 8915508 diff --git a/tools/regression/geom/Ref/disk.flat.da1.xml b/tools/regression/geom/Ref/disk.flat.da1.xml deleted file mode 100644 index 89e2df4..0000000 --- a/tools/regression/geom/Ref/disk.flat.da1.xml +++ /dev/null @@ -1,12 +0,0 @@ -$FreeBSD$ -/dev/md34 512 37888 74 -/dev/md34a 512 37748736 73728 -/dev/md34b 512 268435456 524288 -/dev/md34c 512 8422686720 16450560 -/dev/md34h 512 8115978240 15851520 -/dev/md34s1 512 18367017984 35873082 -/dev/md34s1b 512 419430400 819200 -/dev/md34s1c 512 18367017984 35873082 -/dev/md34s1e 512 419430400 819200 -/dev/md34s1f 512 1073741824 2097152 -/dev/md34s1g 512 16454415360 32137530 diff --git a/tools/regression/geom/Ref/disk.kern.flp.xml b/tools/regression/geom/Ref/disk.kern.flp.xml deleted file mode 100644 index 6ff67a0..0000000 --- a/tools/regression/geom/Ref/disk.kern.flp.xml +++ /dev/null @@ -1,5 +0,0 @@ -$FreeBSD$ -/dev/md34 512 5632 11 -/dev/md34a 512 1474560 2880 -/dev/md34b 512 1474560 2880 -/dev/md34c 512 1474560 2880 diff --git a/tools/regression/geom/Ref/disk.msdos.ext.xml b/tools/regression/geom/Ref/disk.msdos.ext.xml deleted file mode 100644 index dc2aced..0000000 --- a/tools/regression/geom/Ref/disk.msdos.ext.xml +++ /dev/null @@ -1,27 +0,0 @@ -$FreeBSD$ -/dev/md34 512 2327759360 4546405 -/dev/md34s1 512 2146765824 4192902 -/dev/md34s10 512 8193024 16002 -/dev/md34s11 512 8193024 16002 -/dev/md34s12 512 8193024 16002 -/dev/md34s13 512 8193024 16002 -/dev/md34s14 512 8193024 16002 -/dev/md34s15 512 8193024 16002 -/dev/md34s16 512 8193024 16002 -/dev/md34s17 512 8193024 16002 -/dev/md34s18 512 8193024 16002 -/dev/md34s19 512 8193024 16002 -/dev/md34s2 512 427714560 835380 -/dev/md34s20 512 8193024 16002 -/dev/md34s21 512 8193024 16002 -/dev/md34s22 512 8193024 16002 -/dev/md34s23 512 8193024 16002 -/dev/md34s24 512 8193024 16002 -/dev/md34s25 512 8193024 16002 -/dev/md34s26 512 8193024 16002 -/dev/md34s27 512 8193024 16002 -/dev/md34s5 512 8193024 16002 -/dev/md34s6 512 8193024 16002 -/dev/md34s7 512 8193024 16002 -/dev/md34s8 512 8193024 16002 -/dev/md34s9 512 8193024 16002 diff --git a/tools/regression/geom/Ref/disk.msdos.flp.xml b/tools/regression/geom/Ref/disk.msdos.flp.xml deleted file mode 100644 index c176c58..0000000 --- a/tools/regression/geom/Ref/disk.msdos.flp.xml +++ /dev/null @@ -1,2 +0,0 @@ -$FreeBSD$ -/dev/md34 512 5632 11 diff --git a/tools/regression/geom/Ref/disk.pc98.wdc0.xml b/tools/regression/geom/Ref/disk.pc98.wdc0.xml deleted file mode 100644 index 5ffb0c9..0000000 --- a/tools/regression/geom/Ref/disk.pc98.wdc0.xml +++ /dev/null @@ -1,8 +0,0 @@ -$FreeBSD$ -/dev/md34 512 75264 147 1 8 17 -/dev/md34s1 512 1626603520 3176960 23360 8 17 -/dev/md34s1a 512 78643200 153600 1129 8 17 -/dev/md34s1b 512 104857600 204800 1505 8 17 -/dev/md34s1c 512 1626603520 3176960 23360 8 17 -/dev/md34s1e 512 52428800 102400 752 8 17 -/dev/md34s1f 512 1390673920 2716160 19971 8 17 diff --git a/tools/regression/geom/Ref/disk.sun.da0.xml b/tools/regression/geom/Ref/disk.sun.da0.xml deleted file mode 100644 index 15b97c8..0000000 --- a/tools/regression/geom/Ref/disk.sun.da0.xml +++ /dev/null @@ -1,6 +0,0 @@ -$FreeBSD$ -/dev/md34 512 5120 10 -/dev/md34a 512 1529708544 2987712 -/dev/md34b 512 539320320 1053360 -/dev/md34c 512 36698296320 71676360 -/dev/md34h 512 34629267456 67635288 diff --git a/tools/regression/geom/Ref/disk.sun.da1.xml b/tools/regression/geom/Ref/disk.sun.da1.xml deleted file mode 100644 index 004771b..0000000 --- a/tools/regression/geom/Ref/disk.sun.da1.xml +++ /dev/null @@ -1,9 +0,0 @@ -$FreeBSD$ -/dev/md34 512 5120 10 -/dev/md34a 512 262967296 513608 -/dev/md34b 512 1075994624 2101552 -/dev/md34c 512 18108555264 35368272 -/dev/md34d 512 11124240384 21727032 -/dev/md34f 512 2149576704 4198392 -/dev/md34g 512 2149576704 4198392 -/dev/md34h 512 1343787008 2624584 diff --git a/tools/regression/geom/Ref/disk.typo.ad0.xml b/tools/regression/geom/Ref/disk.typo.ad0.xml deleted file mode 100644 index 6d537dd..0000000 --- a/tools/regression/geom/Ref/disk.typo.ad0.xml +++ /dev/null @@ -1,14 +0,0 @@ -$FreeBSD$ -/dev/md34 512 8585262592 16768091 -/dev/md34s1 512 3220406784 6289857 -/dev/md34s1a 512 104857600 204800 -/dev/md34s1b 512 524288000 1024000 -/dev/md34s1c 512 3220406784 6289857 -/dev/md34s1e 512 524288000 1024000 -/dev/md34s1f 512 2066973184 4037057 -/dev/md34s2 512 5364817920 10478160 -/dev/md34s2c 512 5364817920 10478160 -/dev/md34s3 512 8585256960 16768080 -/dev/md34s3a 512 2097152000 4096000 -/dev/md34s3c 512 8585256960 16768080 -/dev/md34s3d 512 6488104960 12672080 diff --git a/tools/regression/geom/RunTest.sh b/tools/regression/geom/RunTest.sh deleted file mode 100644 index 46a14b4..0000000 --- a/tools/regression/geom/RunTest.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -MD=34 -TMP=/tmp/$$ - -set -e - -r=0 - -(cd MdLoad && make) > /dev/null 2>&1 - -for f in Data/disk.*.xml -do - b=`basename $f` - mdconfig -d -u $MD > /dev/null 2>&1 || true - if [ -c /dev/md$MD ] ; then - sleep 1 - fi - if [ -c /dev/md$MD ] ; then - sleep 1 - fi - if [ -c /dev/md$MD ] ; then - echo "/dev/md$MD is busy" 1>&2 - exit 1 - fi - MdLoad/MdLoad md${MD} $f - if [ -f Ref/$b ] ; then - if diskinfo /dev/md${MD}* | - diff -I '$FreeBSD' -u Ref/$b - > $TMP; then - echo "PASSED: $b" - else - echo "FAILED: $b" - sed 's/^/ /' $TMP - r=2; - fi - else - diskinfo /dev/md${MD}* > Ref/`basename $f` - fi -done - -mdconfig -d -u $MD > /dev/null 2>&1 || true -rm -f $TMP -exit $r diff --git a/tools/regression/geom/RunTest.t b/tools/regression/geom/RunTest.t deleted file mode 100644 index 96a3530..0000000 --- a/tools/regression/geom/RunTest.t +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -MD=34 -TMP=/tmp/$$ - -set -e - -# Start from the right directory so we can find all our data files. -cd `dirname $0` - -(cd MdLoad && make) > /dev/null 2>&1 - -# Print the test header -echo -n '1..' -echo `ls -1 Data/disk.*.xml | wc -l` - -for f in Data/disk.*.xml -do - b=`basename $f` - mdconfig -d -u $MD > /dev/null 2>&1 || true - if [ -c /dev/md$MD ] ; then - sleep 1 - fi - if [ -c /dev/md$MD ] ; then - sleep 1 - fi - if [ -c /dev/md$MD ] ; then - echo "Bail out!" - echo "/dev/md$MD is busy" - exit 1 - fi - MdLoad/MdLoad md${MD} $f - if [ -f Ref/$b ] ; then - if diskinfo /dev/md${MD}* | - diff -I '$FreeBSD' -u Ref/$b - > $TMP; then - echo "ok - $b" - else - echo "not ok - $b" - sed 's/^/# /' $TMP - fi - else - diskinfo /dev/md${MD}* > Ref/`basename $f` - fi -done - -mdconfig -d -u $MD > /dev/null 2>&1 || true -rm -f $TMP - -exit 0 diff --git a/tools/regression/geom_concat/conf.sh b/tools/regression/geom_concat/conf.sh deleted file mode 100644 index 0eaf1ba..0000000 --- a/tools/regression/geom_concat/conf.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -name="test" -class="concat" -base=`basename $0` - -. `dirname $0`/../geom_subr.sh diff --git a/tools/regression/geom_concat/test-1.t b/tools/regression/geom_concat/test-1.t deleted file mode 100644 index 8984f79..0000000 --- a/tools/regression/geom_concat/test-1.t +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo '1..1' - -us=45 - -mdconfig -a -t malloc -s 1M -u $us || exit 1 -mdconfig -a -t malloc -s 2M -u `expr $us + 1` || exit 1 -mdconfig -a -t malloc -s 3M -u `expr $us + 2` || exit 1 - -gconcat create $name /dev/md${us} /dev/md`expr $us + 1` /dev/md`expr $us + 2` || exit 1 -devwait - -# Size of created device should be 1MB + 2MB + 3MB. - -size=`diskinfo /dev/concat/${name} | awk '{print $3}'` - -if [ $size -eq 6291456 ]; then - echo "ok - Size is 6291456" -else - echo "not ok - Size is 6291456" -fi - -gconcat destroy $name -mdconfig -d -u $us -mdconfig -d -u `expr $us + 1` -mdconfig -d -u `expr $us + 2` diff --git a/tools/regression/geom_concat/test-2.t b/tools/regression/geom_concat/test-2.t deleted file mode 100644 index 445d9bc..0000000 --- a/tools/regression/geom_concat/test-2.t +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo '1..1' - -us=45 -tsize=6 -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 - -dd if=/dev/random of=${src} bs=1m count=$tsize >/dev/null 2>&1 - -mdconfig -a -t malloc -s 1M -u $us || exit 1 -mdconfig -a -t malloc -s 2M -u `expr $us + 1` || exit 1 -mdconfig -a -t malloc -s 3M -u `expr $us + 2` || exit 1 - -gconcat create $name /dev/md${us} /dev/md`expr $us + 1` /dev/md`expr $us + 2` || exit 1 -devwait - -dd if=${src} of=/dev/concat/${name} bs=1m count=$tsize >/dev/null 2>&1 -dd if=/dev/concat/${name} of=${dst} bs=1m count=$tsize >/dev/null 2>&1 - -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok - md5 checksum comparison" -else - echo "ok - md5 checksum comparison" -fi - -gconcat destroy $name -mdconfig -d -u $us -mdconfig -d -u `expr $us + 1` -mdconfig -d -u `expr $us + 2` -rm -f ${src} ${dst} diff --git a/tools/regression/geom_eli/attach-d.t b/tools/regression/geom_eli/attach-d.t deleted file mode 100644 index 4c4789e..0000000 --- a/tools/regression/geom_eli/attach-d.t +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -base=`basename $0` -no=45 -sectors=100 -keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1 -mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1 - -echo "1..3" - -dd if=/dev/random of=${keyfile} bs=512 count=16 >/dev/null 2>&1 - -geli init -B none -P -K $keyfile md${no} -geli attach -d -p -k $keyfile md${no} -if [ -c /dev/md${no}.eli ]; then - echo "ok 1" -else - echo "not ok 1" -fi -# Be sure it doesn't detach on read. -dd if=/dev/md${no}.eli of=/dev/null 2>/dev/null -sleep 1 -if [ -c /dev/md${no}.eli ]; then - echo "ok 2" -else - echo "not ok 2" -fi -true > /dev/md${no}.eli -sleep 1 -if [ ! -c /dev/md${no}.eli ]; then - echo "ok 3" -else - echo "not ok 3" -fi - -mdconfig -d -u $no -rm -f $keyfile diff --git a/tools/regression/geom_eli/configure-b-B.t b/tools/regression/geom_eli/configure-b-B.t deleted file mode 100644 index 23aa412..0000000 --- a/tools/regression/geom_eli/configure-b-B.t +++ /dev/null @@ -1,130 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -base=`basename $0` -no=45 -sectors=100 -mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1 - -echo "1..17" - -geli init -B none -P -K /dev/null md${no} -if [ $? -eq 0 ]; then - echo "ok 1" -else - echo "not ok 1" -fi - -geli dump md${no} | egrep 'flags: 0x0$' >/dev/null -if [ $? -eq 0 ]; then - echo "ok 2" -else - echo "not ok 2" -fi - -geli init -B none -b -P -K /dev/null md${no} -if [ $? -eq 0 ]; then - echo "ok 3" -else - echo "not ok 3" -fi - -geli dump md${no} | egrep 'flags: 0x2$' >/dev/null -if [ $? -eq 0 ]; then - echo "ok 4" -else - echo "not ok 4" -fi - -geli configure -B md${no} -if [ $? -eq 0 ]; then - echo "ok 5" -else - echo "not ok 5" -fi - -geli dump md${no} | egrep 'flags: 0x0$' >/dev/null -if [ $? -eq 0 ]; then - echo "ok 6" -else - echo "not ok 6" -fi - -geli configure -b md${no} -if [ $? -eq 0 ]; then - echo "ok 7" -else - echo "not ok 7" -fi - -geli dump md${no} | egrep 'flags: 0x2$' >/dev/null -if [ $? -eq 0 ]; then - echo "ok 8" -else - echo "not ok 8" -fi - -geli attach -p -k /dev/null md${no} -if [ $? -eq 0 ]; then - echo "ok 9" -else - echo "not ok 9" -fi - -geli list md${no}.eli | egrep '^Flags: .*BOOT' >/dev/null -if [ $? -eq 0 ]; then - echo "ok 10" -else - echo "not ok 10" -fi - -geli configure -B md${no} -if [ $? -eq 0 ]; then - echo "ok 11" -else - echo "not ok 11" -fi - -geli list md${no}.eli | egrep '^Flags: .*BOOT' >/dev/null -if [ $? -ne 0 ]; then - echo "ok 12" -else - echo "not ok 12" -fi - -geli dump md${no} | egrep 'flags: 0x0$' >/dev/null -if [ $? -eq 0 ]; then - echo "ok 13" -else - echo "not ok 13" -fi - -geli configure -b md${no} -if [ $? -eq 0 ]; then - echo "ok 14" -else - echo "not ok 14" -fi - -geli list md${no}.eli | egrep '^Flags: .*BOOT' >/dev/null -if [ $? -eq 0 ]; then - echo "ok 15" -else - echo "not ok 15" -fi - -geli dump md${no} | egrep 'flags: 0x2$' >/dev/null -if [ $? -eq 0 ]; then - echo "ok 16" -else - echo "not ok 16" -fi - -geli detach md${no} -if [ $? -eq 0 ]; then - echo "ok 17" -else - echo "not ok 17" -fi - -mdconfig -d -u $no diff --git a/tools/regression/geom_eli/delkey.t b/tools/regression/geom_eli/delkey.t deleted file mode 100644 index a828622..0000000 --- a/tools/regression/geom_eli/delkey.t +++ /dev/null @@ -1,140 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -base=`basename $0` -no=45 -sectors=100 -keyfile1=`mktemp /tmp/$base.XXXXXX` || exit 1 -keyfile2=`mktemp /tmp/$base.XXXXXX` || exit 1 -keyfile3=`mktemp /tmp/$base.XXXXXX` || exit 1 -keyfile4=`mktemp /tmp/$base.XXXXXX` || exit 1 -mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1 - -echo "1..14" - -dd if=/dev/random of=${keyfile1} bs=512 count=16 >/dev/null 2>&1 -dd if=/dev/random of=${keyfile2} bs=512 count=16 >/dev/null 2>&1 -dd if=/dev/random of=${keyfile3} bs=512 count=16 >/dev/null 2>&1 -dd if=/dev/random of=${keyfile4} bs=512 count=16 >/dev/null 2>&1 - -geli init -B none -P -K $keyfile1 md${no} -geli attach -p -k $keyfile1 md${no} -geli setkey -n 1 -P -K $keyfile2 md${no} - -# Remove key 0 for attached provider. -geli delkey -n 0 md${no} -if [ $? -eq 0 ]; then - echo "ok 1" -else - echo "not ok 1" -fi -geli detach md${no} - -# We cannot use keyfile1 anymore. -geli attach -p -k $keyfile1 md${no} 2>/dev/null -if [ $? -ne 0 ]; then - echo "ok 2" -else - echo "not ok 2" -fi - -# Attach with key 1. -geli attach -p -k $keyfile2 md${no} -if [ $? -eq 0 ]; then - echo "ok 3" -else - echo "not ok 3" -fi - -# We cannot remove last key without -f option (for attached provider). -geli delkey -n 1 md${no} 2>/dev/null -if [ $? -ne 0 ]; then - echo "ok 4" -else - echo "not ok 4" -fi - -# Remove last key for attached provider. -geli delkey -f -n 1 md${no} -if [ $? -eq 0 ]; then - echo "ok 5" -else - echo "not ok 5" -fi - -# If there are no valid keys, but provider is attached, we can save situation. -geli setkey -n 0 -P -K $keyfile3 md${no} -if [ $? -eq 0 ]; then - echo "ok 6" -else - echo "not ok 6" -fi -geli detach md${no} - -# We cannot use keyfile2 anymore. -geli attach -p -k $keyfile2 md${no} 2>/dev/null -if [ $? -ne 0 ]; then - echo "ok 7" -else - echo "not ok 7" -fi - -# Attach with key 0. -geli attach -p -k $keyfile3 md${no} -if [ $? -eq 0 ]; then - echo "ok 8" -else - echo "not ok 8" -fi - -# Setup key 1. -geli setkey -n 1 -P -K $keyfile4 md${no} -if [ $? -eq 0 ]; then - echo "ok 9" -else - echo "not ok 9" -fi -geli detach md${no} - -# Remove key 1 for detached provider. -geli delkey -n 1 md${no} -if [ $? -eq 0 ]; then - echo "ok 10" -else - echo "not ok 10" -fi - -# We cannot use keyfile4 anymore. -geli attach -p -k $keyfile4 md${no} 2>/dev/null -if [ $? -ne 0 ]; then - echo "ok 11" -else - echo "not ok 11" -fi - -# We cannot remove last key without -f option (for detached provider). -geli delkey -n 0 md${no} 2>/dev/null -if [ $? -ne 0 ]; then - echo "ok 12" -else - echo "not ok 12" -fi - -# Remove last key for detached provider. -geli delkey -f -n 0 md${no} -if [ $? -eq 0 ]; then - echo "ok 13" -else - echo "not ok 13" -fi - -# We cannot use keyfile3 anymore. -geli attach -p -k $keyfile3 md${no} 2>/dev/null -if [ $? -ne 0 ]; then - echo "ok 14" -else - echo "not ok 14" -fi - -mdconfig -d -u $no -rm -f $keyfile1 $keyfile2 $keyfile3 $keyfile4 diff --git a/tools/regression/geom_eli/detach-l.t b/tools/regression/geom_eli/detach-l.t deleted file mode 100644 index dfa3269..0000000 --- a/tools/regression/geom_eli/detach-l.t +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -base=`basename $0` -no=45 -sectors=100 -keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1 -mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1 - -echo "1..4" - -dd if=/dev/random of=${keyfile} bs=512 count=16 >/dev/null 2>&1 - -geli init -B none -P -K $keyfile md${no} -geli attach -p -k $keyfile md${no} -if [ -c /dev/md${no}.eli ]; then - echo "ok 1" -else - echo "not ok 1" -fi -# Be sure it doesn't detach before 'detach -l'. -dd if=/dev/md${no}.eli of=/dev/null 2>/dev/null -sleep 1 -if [ -c /dev/md${no}.eli ]; then - echo "ok 2" -else - echo "not ok 2" -fi -geli detach -l md${no} -if [ -c /dev/md${no}.eli ]; then - echo "ok 3" -else - echo "not ok 3" -fi -dd if=/dev/md${no}.eli of=/dev/null 2>/dev/null -sleep 1 -if [ ! -c /dev/md${no}.eli ]; then - echo "ok 4" -else - echo "not ok 4" -fi - -mdconfig -d -u $no -rm -f $keyfile diff --git a/tools/regression/geom_eli/init-B.t b/tools/regression/geom_eli/init-B.t deleted file mode 100644 index 36ab873..0000000 --- a/tools/regression/geom_eli/init-B.t +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -base=`basename $0` -no=45 -sectors=100 -keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1 -backupfile=`mktemp /tmp/$base.XXXXXX` || exit 1 - -echo "1..13" - -dd if=/dev/random of=${keyfile} bs=512 count=16 >/dev/null 2>&1 - -mdconfig -a -t malloc -s $sectors -u $no || exit 1 - -# -B none -rm -f /var/backups/md${no}.eli -geli init -B none -P -K $keyfile md${no} 2>/dev/null -if [ ! -f /var/backups/md${no}.eli ]; then - echo "ok 1 - -B none" -else - echo "not ok 1 - -B none" -fi - -# no -B -rm -f /var/backups/md${no}.eli -geli init -P -K $keyfile md${no} >/dev/null 2>&1 -if [ -f /var/backups/md${no}.eli ]; then - echo "ok 2 - no -B" -else - echo "not ok 2 - no -B" -fi -geli clear md${no} -geli attach -p -k $keyfile md${no} 2>/dev/null -if [ $? -ne 0 ]; then - echo "ok 3 - no -B" -else - echo "not ok 3 - no -B" -fi -if [ ! -c /dev/md${no}.eli ]; then - echo "ok 4 - no -B" -else - echo "not ok 4 - no -B" -fi -geli restore /var/backups/md${no}.eli md${no} -if [ $? -eq 0 ]; then - echo "ok 5 - no -B" -else - echo "not ok 5 - no -B" -fi -geli attach -p -k $keyfile md${no} 2>/dev/null -if [ $? -eq 0 ]; then - echo "ok 6 - no -B" -else - echo "not ok 6 - no -B" -fi -if [ -c /dev/md${no}.eli ]; then - echo "ok 7 - no -B" -else - echo "not ok 7 - no -B" -fi -geli detach md${no} -rm -f /var/backups/md${no}.eli - -# -B file -rm -f $backupfile -geli init -B $backupfile -P -K $keyfile md${no} >/dev/null 2>&1 -if [ -f $backupfile ]; then - echo "ok 8 - -B file" -else - echo "not ok 8 - -B file" -fi -geli clear md${no} -geli attach -p -k $keyfile md${no} 2>/dev/null -if [ $? -ne 0 ]; then - echo "ok 9 - -B file" -else - echo "not ok 9 - -B file" -fi -if [ ! -c /dev/md${no}.eli ]; then - echo "ok 10 - -B file" -else - echo "not ok 10 - -B file" -fi -geli restore $backupfile md${no} -if [ $? -eq 0 ]; then - echo "ok 11 - -B file" -else - echo "not ok 11 - -B file" -fi -geli attach -p -k $keyfile md${no} 2>/dev/null -if [ $? -eq 0 ]; then - echo "ok 12 - -B file" -else - echo "not ok 12 - -B file" -fi -if [ -c /dev/md${no}.eli ]; then - echo "ok 13 - -B file" -else - echo "not ok 13 - -B file" -fi -geli detach md${no} -rm -f $backupfile - -mdconfig -d -u $no -rm -f $keyfile diff --git a/tools/regression/geom_eli/init-J.t b/tools/regression/geom_eli/init-J.t deleted file mode 100644 index 6f2862f..0000000 --- a/tools/regression/geom_eli/init-J.t +++ /dev/null @@ -1,126 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -base=`basename $0` -no=45 -sectors=100 -keyfile0=`mktemp /tmp/$base.XXXXXX` || exit 1 -keyfile1=`mktemp /tmp/$base.XXXXXX` || exit 1 -passfile0=`mktemp /tmp/$base.XXXXXX` || exit 1 -passfile1=`mktemp /tmp/$base.XXXXXX` || exit 1 -mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1 - -echo "1..150" - -dd if=/dev/random of=${keyfile0} bs=512 count=16 >/dev/null 2>&1 -dd if=/dev/random of=${keyfile1} bs=512 count=16 >/dev/null 2>&1 -dd if=/dev/random bs=512 count=16 2>/dev/null | sha1 > ${passfile0} -dd if=/dev/random bs=512 count=16 2>/dev/null | sha1 > ${passfile1} - -i=1 -for iter in -1 0 64; do - geli init -i ${iter} -B none -J ${passfile0} -P md${no} 2>/dev/null && echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli init -i ${iter} -B none -J ${passfile0} -P -K ${keyfile0} md${no} 2>/dev/null && echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli init -i ${iter} -B none -J ${passfile0} -K ${keyfile0} md${no} 2>/dev/null || echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli attach -k ${keyfile0} -p md${no} 2>/dev/null && echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli attach -j ${passfile0} md${no} 2>/dev/null && echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli attach -j ${keyfile0} md${no} 2>/dev/null && echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli attach -k ${passfile0} -p md${no} 2>/dev/null && echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli attach -j ${keyfile0} -k ${passfile0} md${no} 2>/dev/null && echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli attach -j ${keyfile0} -k ${keyfile0} md${no} 2>/dev/null && echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli attach -j ${passfile0} -k ${passfile0} md${no} 2>/dev/null && echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli attach -j ${passfile0} -k ${keyfile0} md${no} 2>/dev/null || echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli detach md${no} || echo -n "not " - echo "ok ${i}"; i=$((i+1)) - cat ${keyfile0} | geli attach -j ${passfile0} -k - md${no} 2>/dev/null || echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli detach md${no} || echo -n "not " - echo "ok ${i}"; i=$((i+1)) - cat ${passfile0} | geli attach -j - -k ${keyfile0} md${no} 2>/dev/null || echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli detach md${no} || echo -n "not " - echo "ok ${i}"; i=$((i+1)) - - geli init -i ${iter} -B none -J ${passfile0} -J ${passfile1} -P md${no} 2>/dev/null && echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli init -i ${iter} -B none -J ${passfile0} -J ${passfile1} -P -K ${keyfile0} -K ${keyfile1} md${no} 2>/dev/null && echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli init -i ${iter} -B none -J ${passfile0} -J ${passfile1} -K ${keyfile0} -K ${keyfile1} md${no} 2>/dev/null || echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli attach -k ${keyfile0} -p md${no} 2>/dev/null && echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli attach -k ${keyfile1} -p md${no} 2>/dev/null && echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli attach -j ${passfile0} md${no} 2>/dev/null && echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli attach -j ${passfile1} md${no} 2>/dev/null && echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli attach -k ${keyfile0} -k ${keyfile1} -p md${no} 2>/dev/null && echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli attach -j ${passfile0} -j ${passfile1} md${no} 2>/dev/null && echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli attach -k ${keyfile0} -j ${passfile0} md${no} 2>/dev/null && echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli attach -k ${keyfile0} -j ${passfile1} md${no} 2>/dev/null && echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli attach -k ${keyfile1} -j ${passfile0} md${no} 2>/dev/null && echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli attach -k ${keyfile1} -j ${passfile1} md${no} 2>/dev/null && echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli attach -k ${keyfile0} -j ${passfile0} -j ${passfile1} md${no} 2>/dev/null && echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli attach -k ${keyfile1} -j ${passfile0} -j ${passfile1} md${no} 2>/dev/null && echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli attach -k ${keyfile0} -k ${keyfile1} -j ${passfile0} md${no} 2>/dev/null && echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli attach -k ${keyfile0} -k ${keyfile1} -j ${passfile1} md${no} 2>/dev/null && echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli attach -k ${keyfile1} -k ${keyfile0} -j ${passfile0} -j ${passfile1} md${no} 2>/dev/null && echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli attach -k ${keyfile0} -k ${keyfile1} -j ${passfile1} -j ${passfile0} md${no} 2>/dev/null && echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli attach -k ${keyfile1} -k ${keyfile0} -j ${passfile1} -j ${passfile0} md${no} 2>/dev/null && echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli attach -j ${passfile0} -j ${passfile1} -k ${keyfile0} -k ${keyfile1} md${no} 2>/dev/null || echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli detach md${no} || echo -n "not " - echo "ok ${i}"; i=$((i+1)) - cat ${passfile0} | geli attach -j - -j ${passfile1} -k ${keyfile0} -k ${keyfile1} md${no} 2>/dev/null || echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli detach md${no} || echo -n "not " - echo "ok ${i}"; i=$((i+1)) - cat ${passfile1} | geli attach -j ${passfile0} -j - -k ${keyfile0} -k ${keyfile1} md${no} 2>/dev/null || echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli detach md${no} || echo -n "not " - echo "ok ${i}"; i=$((i+1)) - cat ${keyfile0} | geli attach -j ${passfile0} -j ${passfile1} -k - -k ${keyfile1} md${no} 2>/dev/null || echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli detach md${no} || echo -n "not " - echo "ok ${i}"; i=$((i+1)) - cat ${keyfile1} | geli attach -j ${passfile0} -j ${passfile1} -k ${keyfile0} -k - md${no} 2>/dev/null || echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli detach md${no} || echo -n "not " - echo "ok ${i}"; i=$((i+1)) - cat ${keyfile0} ${keyfile1} | geli attach -j ${passfile0} -j ${passfile1} -k - md${no} 2>/dev/null || echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli detach md${no} || echo -n "not " - echo "ok ${i}"; i=$((i+1)) - cat ${passfile0} ${passfile1} | awk '{printf "%s", $0}' | geli attach -j - -k ${keyfile0} -k ${keyfile1} md${no} 2>/dev/null || echo -n "not " - echo "ok ${i}"; i=$((i+1)) - geli detach md${no} || echo -n "not " - echo "ok ${i}"; i=$((i+1)) -done - -mdconfig -d -u $no -rm -f ${keyfile0} ${keyfile1} ${passfile0} ${passfile1} diff --git a/tools/regression/geom_eli/init-a.t b/tools/regression/geom_eli/init-a.t deleted file mode 100644 index 87612a2..0000000 --- a/tools/regression/geom_eli/init-a.t +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -base=`basename $0` -no=45 -sectors=100 -keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1 - -echo "1..1380" - -i=1 -for cipher in aes:0 aes:128 aes:256 \ - aes-xts:0 aes-xts:128 aes-xts:256 \ - aes-cbc:0 aes-cbc:128 aes-cbc:192 aes-cbc:256 \ - 3des:0 3des:192 \ - 3des-cbc:0 3des-cbc:192 \ - blowfish:0 blowfish:128 blowfish:160 blowfish:192 blowfish:224 \ - blowfish:256 blowfish:288 blowfish:320 blowfish:352 blowfish:384 \ - blowfish:416 blowfish:448 \ - blowfish-cbc:0 blowfish-cbc:128 blowfish-cbc:160 blowfish-cbc:192 blowfish-cbc:224 \ - blowfish-cbc:256 blowfish-cbc:288 blowfish-cbc:320 blowfish-cbc:352 blowfish-cbc:384 \ - blowfish-cbc:416 blowfish-cbc:448 \ - camellia:0 camellia:128 camellia:192 camellia:256 \ - camellia-cbc:0 camellia-cbc:128 camellia-cbc:192 camellia-cbc:256; do - ealgo=${cipher%%:*} - keylen=${cipher##*:} - for aalgo in hmac/md5 hmac/sha1 hmac/ripemd160 hmac/sha256 hmac/sha384 hmac/sha512; do - for secsize in 512 1024 2048 4096 8192; do - rnd=`mktemp /tmp/$base.XXXXXX` || exit 1 - mdconfig -a -t malloc -s `expr $secsize \* $sectors + 512`b -u $no || exit 1 - - dd if=/dev/random of=${keyfile} bs=512 count=16 >/dev/null 2>&1 - - geli init -B none -a $aalgo -e $ealgo -l $keylen -P -K $keyfile -s $secsize md${no} 2>/dev/null - geli attach -p -k $keyfile md${no} - - secs=`diskinfo /dev/md${no}.eli | awk '{print $4}'` - - dd if=/dev/random of=${rnd} bs=${secsize} count=${secs} >/dev/null 2>&1 - dd if=${rnd} of=/dev/md${no}.eli bs=${secsize} count=${secs} 2>/dev/null - - md_rnd=`dd if=${rnd} bs=${secsize} count=${secs} 2>/dev/null | md5` - md_ddev=`dd if=/dev/md${no}.eli bs=${secsize} count=${secs} 2>/dev/null | md5` - - if [ ${md_rnd} = ${md_ddev} ]; then - echo "ok $i - aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}" - else - echo "not ok $i - aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}" - fi - i=$((i+1)) - - geli detach md${no} - rm -f $rnd - mdconfig -d -u $no - done - done -done - -rm -f $keyfile diff --git a/tools/regression/geom_eli/init-i-P.t b/tools/regression/geom_eli/init-i-P.t deleted file mode 100644 index a06f9f8..0000000 --- a/tools/regression/geom_eli/init-i-P.t +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -base=`basename $0` -no=45 -sectors=100 -keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1 -mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1 - -echo "1..1" - -dd if=/dev/random of=${keyfile} bs=512 count=16 >/dev/null 2>&1 - -geli init -B none -i 64 -P -K ${keyfile} md${no} 2>/dev/null -if [ $? -ne 0 ]; then - echo "ok 1" -else - echo "not ok 1" -fi - -mdconfig -d -u $no -rm -f $keyfile diff --git a/tools/regression/geom_eli/init.t b/tools/regression/geom_eli/init.t deleted file mode 100644 index 6934443..0000000 --- a/tools/regression/geom_eli/init.t +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -base=`basename $0` -no=45 -sectors=100 -keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1 - -echo "1..460" - -i=1 -for cipher in aes:0 aes:128 aes:256 \ - aes-xts:0 aes-xts:128 aes-xts:256 \ - aes-cbc:0 aes-cbc:128 aes-cbc:192 aes-cbc:256 \ - 3des:0 3des:192 \ - 3des-cbc:0 3des-cbc:192 \ - blowfish:0 blowfish:128 blowfish:160 blowfish:192 blowfish:224 \ - blowfish:256 blowfish:288 blowfish:320 blowfish:352 blowfish:384 \ - blowfish:416 blowfish:448 \ - blowfish-cbc:0 blowfish-cbc:128 blowfish-cbc:160 blowfish-cbc:192 blowfish-cbc:224 \ - blowfish-cbc:256 blowfish-cbc:288 blowfish-cbc:320 blowfish-cbc:352 blowfish-cbc:384 \ - blowfish-cbc:416 blowfish-cbc:448 \ - camellia:0 camellia:128 camellia:192 camellia:256 \ - camellia-cbc:0 camellia-cbc:128 camellia-cbc:192 camellia-cbc:256; do - ealgo=${cipher%%:*} - keylen=${cipher##*:} - for secsize in 512 1024 2048 4096 8192; do - rnd=`mktemp /tmp/$base.XXXXXX` || exit 1 - mdconfig -a -t malloc -s `expr $secsize \* $sectors + 512`b -u $no || exit 1 - - dd if=/dev/random of=${keyfile} bs=512 count=16 >/dev/null 2>&1 - - geli init -B none -e $ealgo -l $keylen -P -K $keyfile -s $secsize md${no} 2>/dev/null - geli attach -p -k $keyfile md${no} - - secs=`diskinfo /dev/md${no}.eli | awk '{print $4}'` - - dd if=/dev/random of=${rnd} bs=${secsize} count=${secs} >/dev/null 2>&1 - dd if=${rnd} of=/dev/md${no}.eli bs=${secsize} count=${secs} 2>/dev/null - - md_rnd=`dd if=${rnd} bs=${secsize} count=${secs} 2>/dev/null | md5` - md_ddev=`dd if=/dev/md${no}.eli bs=${secsize} count=${secs} 2>/dev/null | md5` - md_edev=`dd if=/dev/md${no} bs=${secsize} count=${secs} 2>/dev/null | md5` - - if [ ${md_rnd} = ${md_ddev} ]; then - echo "ok $i - ealgo=${ealgo} keylen=${keylen} sec=${secsize}" - else - echo "not ok $i - ealgo=${ealgo} keylen=${keylen} sec=${secsize}" - fi - i=$((i+1)) - if [ ${md_rnd} != ${md_edev} ]; then - echo "ok $i - ealgo=${ealgo} keylen=${keylen} sec=${secsize}" - else - echo "not ok $i - ealgo=${ealgo} keylen=${keylen} sec=${secsize}" - fi - i=$((i+1)) - - geli detach md${no} - rm -f $rnd - mdconfig -d -u $no - done -done - -rm -f $keyfile diff --git a/tools/regression/geom_eli/integrity-copy.t b/tools/regression/geom_eli/integrity-copy.t deleted file mode 100644 index b52730a..0000000 --- a/tools/regression/geom_eli/integrity-copy.t +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -base=`basename $0` -no=45 -sectors=100 -keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1 -sector=`mktemp /tmp/$base.XXXXXX` || exit 1 - -echo "1..5520" - -i=1 -for cipher in aes:0 aes:128 aes:256 \ - aes-xts:0 aes-xts:128 aes-xts:256 \ - aes-cbc:0 aes-cbc:128 aes-cbc:192 aes-cbc:256 \ - 3des:0 3des:192 \ - 3des-cbc:0 3des-cbc:192 \ - blowfish:0 blowfish:128 blowfish:160 blowfish:192 blowfish:224 \ - blowfish:256 blowfish:288 blowfish:320 blowfish:352 blowfish:384 \ - blowfish:416 blowfish:448 \ - blowfish-cbc:0 blowfish-cbc:128 blowfish-cbc:160 blowfish-cbc:192 blowfish-cbc:224 \ - blowfish-cbc:256 blowfish-cbc:288 blowfish-cbc:320 blowfish-cbc:352 blowfish-cbc:384 \ - blowfish-cbc:416 blowfish-cbc:448 \ - camellia:0 camellia:128 camellia:192 camellia:256 \ - camellia-cbc:0 camellia-cbc:128 camellia-cbc:192 camellia-cbc:256; do - ealgo=${cipher%%:*} - keylen=${cipher##*:} - for aalgo in hmac/md5 hmac/sha1 hmac/ripemd160 hmac/sha256 hmac/sha384 hmac/sha512; do - for secsize in 512 1024 2048 4096 8192; do - #mdconfig -a -t malloc -s `expr $secsize \* 2 + 512`b -u $no || exit 1 - mdconfig -a -t malloc -s $sectors -u $no || exit 1 - - dd if=/dev/random of=${keyfile} bs=512 count=16 >/dev/null 2>&1 - - geli init -B none -a $aalgo -e $ealgo -l $keylen -P -K $keyfile -s $secsize md${no} 2>/dev/null - geli attach -p -k $keyfile md${no} - - dd if=/dev/random of=/dev/md${no}.eli bs=${secsize} count=1 >/dev/null 2>&1 - - dd if=/dev/md${no}.eli bs=${secsize} count=1 >/dev/null 2>&1 - if [ $? -eq 0 ]; then - echo "ok $i - small 1 aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}" - else - echo "not ok $i - small 1 aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}" - fi - i=$((i+1)) - - geli detach md${no} - # Copy first small sector to the second small sector. - # This should be detected as corruption. - dd if=/dev/md${no} of=${sector} bs=512 count=1 >/dev/null 2>&1 - dd if=${sector} of=/dev/md${no} bs=512 count=1 seek=1 >/dev/null 2>&1 - geli attach -p -k $keyfile md${no} - - dd if=/dev/md${no}.eli of=/dev/null bs=${secsize} count=1 >/dev/null 2>&1 - if [ $? -ne 0 ]; then - echo "ok $i - small 2 aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}" - else - echo "not ok $i - small 2 aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}" - fi - i=$((i+1)) - - ms=`diskinfo /dev/md${no} | awk '{print $3 - 512}'` - ns=`diskinfo /dev/md${no}.eli | awk '{print $4}'` - usecsize=`echo "($ms / $ns) - (($ms / $ns) % 512)" | bc` - - dd if=/dev/random of=/dev/md${no}.eli bs=${secsize} count=2 >/dev/null 2>&1 - - dd if=/dev/md${no}.eli bs=${secsize} count=2 >/dev/null 2>&1 - if [ $? -eq 0 ]; then - echo "ok $i - big 1 aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}" - else - echo "not ok $i - big 1 aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}" - fi - i=$((i+1)) - - geli detach md${no} - # Copy first big sector to the second big sector. - # This should be detected as corruption. - dd if=/dev/md${no} of=${sector} bs=${usecsize} count=1 >/dev/null 2>&1 - dd if=${sector} of=/dev/md${no} bs=${usecsize} count=1 seek=1 >/dev/null 2>&1 - geli attach -p -k $keyfile md${no} - - dd if=/dev/md${no}.eli of=/dev/null bs=${secsize} count=2 >/dev/null 2>&1 - if [ $? -ne 0 ]; then - echo "ok $i - big 2 aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}" - else - echo "not ok $i - big 2 aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}" - fi - i=$((i+1)) - - geli detach md${no} - mdconfig -d -u $no - done - done -done - -rm -f $keyfile $sector diff --git a/tools/regression/geom_eli/integrity-data.t b/tools/regression/geom_eli/integrity-data.t deleted file mode 100644 index 6975466..0000000 --- a/tools/regression/geom_eli/integrity-data.t +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -base=`basename $0` -no=45 -sectors=100 -keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1 -sector=`mktemp /tmp/$base.XXXXXX` || exit 1 - -echo "1..2760" - -i=1 -for cipher in aes:0 aes:128 aes:256 \ - aes-xts:0 aes-xts:128 aes-xts:256 \ - aes-cbc:0 aes-cbc:128 aes-cbc:192 aes-cbc:256 \ - 3des:0 3des:192 \ - 3des-cbc:0 3des-cbc:192 \ - blowfish:0 blowfish:128 blowfish:160 blowfish:192 blowfish:224 \ - blowfish:256 blowfish:288 blowfish:320 blowfish:352 blowfish:384 \ - blowfish:416 blowfish:448 \ - blowfish-cbc:0 blowfish-cbc:128 blowfish-cbc:160 blowfish-cbc:192 blowfish-cbc:224 \ - blowfish-cbc:256 blowfish-cbc:288 blowfish-cbc:320 blowfish-cbc:352 blowfish-cbc:384 \ - blowfish-cbc:416 blowfish-cbc:448 \ - camellia:0 camellia:128 camellia:192 camellia:256 \ - camellia-cbc:0 camellia-cbc:128 camellia-cbc:192 camellia-cbc:256; do - ealgo=${cipher%%:*} - keylen=${cipher##*:} - for aalgo in hmac/md5 hmac/sha1 hmac/ripemd160 hmac/sha256 hmac/sha384 hmac/sha512; do - for secsize in 512 1024 2048 4096 8192; do - mdconfig -a -t malloc -s `expr $secsize \* 2 + 512`b -u $no || exit 1 - - dd if=/dev/random of=${keyfile} bs=512 count=16 >/dev/null 2>&1 - - geli init -B none -a $aalgo -e $ealgo -l $keylen -P -K $keyfile -s $secsize md${no} 2>/dev/null - geli attach -p -k $keyfile md${no} - - dd if=/dev/random of=/dev/md${no}.eli bs=${secsize} count=1 >/dev/null 2>&1 - - dd if=/dev/md${no}.eli bs=${secsize} count=1 >/dev/null 2>&1 - if [ $? -eq 0 ]; then - echo "ok $i - aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}" - else - echo "not ok $i - aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}" - fi - i=$((i+1)) - - geli detach md${no} - # Corrupt 8 bytes of data. - dd if=/dev/md${no} of=${sector} bs=512 count=1 >/dev/null 2>&1 - dd if=/dev/random of=${sector} bs=1 count=8 seek=64 conv=notrunc >/dev/null 2>&1 - dd if=${sector} of=/dev/md${no} bs=512 count=1 >/dev/null 2>&1 - geli attach -p -k $keyfile md${no} - - dd if=/dev/md${no}.eli of=/dev/null bs=${secsize} count=1 >/dev/null 2>&1 - if [ $? -ne 0 ]; then - echo "ok $i - aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}" - else - echo "not ok $i - aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}" - fi - i=$((i+1)) - - geli detach md${no} - mdconfig -d -u $no - done - done -done - -rm -f $keyfile $sector diff --git a/tools/regression/geom_eli/integrity-hmac.t b/tools/regression/geom_eli/integrity-hmac.t deleted file mode 100644 index 33f6029..0000000 --- a/tools/regression/geom_eli/integrity-hmac.t +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -base=`basename $0` -no=45 -sectors=100 -keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1 -sector=`mktemp /tmp/$base.XXXXXX` || exit 1 - -echo "1..2760" - -i=1 -for cipher in aes:0 aes:128 aes:256 \ - aes-xts:0 aes-xts:128 aes-xts:256 \ - aes-cbc:0 aes-cbc:128 aes-cbc:192 aes-cbc:256 \ - 3des:0 3des:192 \ - 3des-cbc:0 3des-cbc:192 \ - blowfish:0 blowfish:128 blowfish:160 blowfish:192 blowfish:224 \ - blowfish:256 blowfish:288 blowfish:320 blowfish:352 blowfish:384 \ - blowfish:416 blowfish:448 \ - blowfish-cbc:0 blowfish-cbc:128 blowfish-cbc:160 blowfish-cbc:192 blowfish-cbc:224 \ - blowfish-cbc:256 blowfish-cbc:288 blowfish-cbc:320 blowfish-cbc:352 blowfish-cbc:384 \ - blowfish-cbc:416 blowfish-cbc:448 \ - camellia:0 camellia:128 camellia:192 camellia:256 \ - camellia-cbc:0 camellia-cbc:128 camellia-cbc:192 camellia-cbc:256; do - ealgo=${cipher%%:*} - keylen=${cipher##*:} - for aalgo in hmac/md5 hmac/sha1 hmac/ripemd160 hmac/sha256 hmac/sha384 hmac/sha512; do - for secsize in 512 1024 2048 4096 8192; do - mdconfig -a -t malloc -s `expr $secsize \* 2 + 512`b -u $no || exit 1 - - dd if=/dev/random of=${keyfile} bs=512 count=16 >/dev/null 2>&1 - - geli init -B none -a $aalgo -e $ealgo -l $keylen -P -K $keyfile -s $secsize md${no} 2>/dev/null - geli attach -p -k $keyfile md${no} - - dd if=/dev/random of=/dev/md${no}.eli bs=${secsize} count=1 >/dev/null 2>&1 - - dd if=/dev/md${no}.eli bs=${secsize} count=1 >/dev/null 2>&1 - if [ $? -eq 0 ]; then - echo "ok $i - aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}" - else - echo "not ok $i - aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}" - fi - i=$((i+1)) - - geli detach md${no} - # Corrupt 8 bytes of HMAC. - dd if=/dev/md${no} of=${sector} bs=512 count=1 >/dev/null 2>&1 - dd if=/dev/random of=${sector} bs=1 count=16 conv=notrunc >/dev/null 2>&1 - dd if=${sector} of=/dev/md${no} bs=512 count=1 >/dev/null 2>&1 - geli attach -p -k $keyfile md${no} - - dd if=/dev/md${no}.eli bs=${secsize} count=1 >/dev/null 2>&1 - if [ $? -ne 0 ]; then - echo "ok $i - aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}" - else - echo "not ok $i - aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}" - fi - i=$((i+1)) - - geli detach md${no} - mdconfig -d -u $no - done - done -done - -rm -f $keyfile $sector diff --git a/tools/regression/geom_eli/kill.t b/tools/regression/geom_eli/kill.t deleted file mode 100644 index 5c315f3..0000000 --- a/tools/regression/geom_eli/kill.t +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -base=`basename $0` -no=45 -sectors=100 -keyfile1=`mktemp /tmp/$base.XXXXXX` || exit 1 -keyfile2=`mktemp /tmp/$base.XXXXXX` || exit 1 -mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1 - -echo "1..9" - -dd if=/dev/random of=${keyfile1} bs=512 count=16 >/dev/null 2>&1 -dd if=/dev/random of=${keyfile2} bs=512 count=16 >/dev/null 2>&1 - -geli init -B none -P -K $keyfile1 md${no} -geli attach -p -k $keyfile1 md${no} -geli setkey -n 1 -P -K $keyfile2 md${no} - -# Kill attached provider. -geli kill md${no} -if [ $? -eq 0 ]; then - echo "ok 1" -else - echo "not ok 1" -fi -sleep 1 -# Provider should be automatically detached. -if [ ! -c /dev/md{$no}.eli ]; then - echo "ok 2" -else - echo "not ok 2" -fi - -# We cannot use keyfile1 anymore. -geli attach -p -k $keyfile1 md${no} 2>/dev/null -if [ $? -ne 0 ]; then - echo "ok 3" -else - echo "not ok 3" -fi - -# We cannot use keyfile2 anymore. -geli attach -p -k $keyfile2 md${no} 2>/dev/null -if [ $? -ne 0 ]; then - echo "ok 4" -else - echo "not ok 4" -fi - -geli init -B none -P -K $keyfile1 md${no} -geli setkey -n 1 -p -k $keyfile1 -P -K $keyfile2 md${no} - -# Should be possible to attach with keyfile1. -geli attach -p -k $keyfile1 md${no} -if [ $? -eq 0 ]; then - echo "ok 5" -else - echo "not ok 5" -fi -geli detach md${no} - -# Should be possible to attach with keyfile2. -geli attach -p -k $keyfile2 md${no} -if [ $? -eq 0 ]; then - echo "ok 6" -else - echo "not ok 6" -fi -geli detach md${no} - -# Kill detached provider. -geli kill md${no} -if [ $? -eq 0 ]; then - echo "ok 7" -else - echo "not ok 7" -fi - -# We cannot use keyfile1 anymore. -geli attach -p -k $keyfile1 md${no} 2>/dev/null -if [ $? -ne 0 ]; then - echo "ok 8" -else - echo "not ok 8" -fi - -# We cannot use keyfile2 anymore. -geli attach -p -k $keyfile2 md${no} 2>/dev/null -if [ $? -ne 0 ]; then - echo "ok 9" -else - echo "not ok 9" -fi - -mdconfig -d -u $no -rm -f $keyfile1 $keyfile2 diff --git a/tools/regression/geom_eli/nokey.t b/tools/regression/geom_eli/nokey.t deleted file mode 100644 index 19ef680..0000000 --- a/tools/regression/geom_eli/nokey.t +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -base=`basename $0` -no=45 -sectors=100 -keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1 -mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1 - -echo "1..8" - -geli init -B none -P md${no} 2>/dev/null -if [ $? -ne 0 ]; then - echo "ok 1" -else - echo "not ok 1" -fi - -dd if=/dev/random of=${keyfile} bs=512 count=16 >/dev/null 2>&1 - -geli init -B none -P -K ${keyfile} md${no} 2>/dev/null -if [ $? -eq 0 ]; then - echo "ok 2" -else - echo "not ok 2" -fi -geli attach -p md${no} 2>/dev/null -if [ $? -ne 0 ]; then - echo "ok 3" -else - echo "not ok 3" -fi -geli attach -p -k ${keyfile} md${no} 2>/dev/null -if [ $? -eq 0 ]; then - echo "ok 4" -else - echo "not ok 4" -fi -geli setkey -n 0 -P md${no} 2>/dev/null -if [ $? -ne 0 ]; then - echo "ok 5" -else - echo "not ok 5" -fi -geli detach md${no} 2>/dev/null -if [ $? -eq 0 ]; then - echo "ok 6" -else - echo "not ok 6" -fi -geli setkey -n 0 -p -P -K ${keyfile} md${no} 2>/dev/null -if [ $? -ne 0 ]; then - echo "ok 7" -else - echo "not ok 7" -fi -geli setkey -n 0 -p -k ${keyfile} -P md${no} 2>/dev/null -if [ $? -ne 0 ]; then - echo "ok 8" -else - echo "not ok 8" -fi - -mdconfig -d -u $no -rm -f $keyfile diff --git a/tools/regression/geom_eli/onetime-a.t b/tools/regression/geom_eli/onetime-a.t deleted file mode 100644 index ab19301..0000000 --- a/tools/regression/geom_eli/onetime-a.t +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -base=`basename $0` -no=45 -sectors=100 - -echo "1..1380" - -i=1 -for cipher in aes:0 aes:128 aes:256 \ - aes-xts:0 aes-xts:128 aes-xts:256 \ - aes-cbc:0 aes-cbc:128 aes-cbc:192 aes-cbc:256 \ - 3des:0 3des:192 \ - 3des-cbc:0 3des-cbc:192 \ - blowfish:0 blowfish:128 blowfish:160 blowfish:192 blowfish:224 \ - blowfish:256 blowfish:288 blowfish:320 blowfish:352 blowfish:384 \ - blowfish:416 blowfish:448 \ - blowfish-cbc:0 blowfish-cbc:128 blowfish-cbc:160 blowfish-cbc:192 blowfish-cbc:224 \ - blowfish-cbc:256 blowfish-cbc:288 blowfish-cbc:320 blowfish-cbc:352 blowfish-cbc:384 \ - blowfish-cbc:416 blowfish-cbc:448 \ - camellia:0 camellia:128 camellia:192 camellia:256 \ - camellia-cbc:0 camellia-cbc:128 camellia-cbc:192 camellia-cbc:256; do - ealgo=${cipher%%:*} - keylen=${cipher##*:} - for aalgo in hmac/md5 hmac/sha1 hmac/ripemd160 hmac/sha256 hmac/sha384 hmac/sha512; do - for secsize in 512 1024 2048 4096 8192; do - rnd=`mktemp /tmp/$base.XXXXXX` || exit 1 - mdconfig -a -t malloc -s `expr $secsize \* $sectors + 512`b -u $no || exit 1 - - geli onetime -a $aalgo -e $ealgo -l $keylen -s $secsize md${no} 2>/dev/null - - secs=`diskinfo /dev/md${no}.eli | awk '{print $4}'` - - dd if=/dev/random of=${rnd} bs=${secsize} count=${secs} >/dev/null 2>&1 - dd if=${rnd} of=/dev/md${no}.eli bs=${secsize} count=${secs} 2>/dev/null - - md_rnd=`dd if=${rnd} bs=${secsize} count=${secs} 2>/dev/null | md5` - md_ddev=`dd if=/dev/md${no}.eli bs=${secsize} count=${secs} 2>/dev/null | md5` - - if [ ${md_rnd} = ${md_ddev} ]; then - echo "ok $i - aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}" - else - echo "not ok $i - aalgo=${aalgo} ealgo=${ealgo} keylen=${keylen} sec=${secsize}" - fi - i=$((i+1)) - - geli detach md${no} - rm -f $rnd - mdconfig -d -u $no - done - done -done diff --git a/tools/regression/geom_eli/onetime-d.t b/tools/regression/geom_eli/onetime-d.t deleted file mode 100644 index d49cb64..0000000 --- a/tools/regression/geom_eli/onetime-d.t +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -base=`basename $0` -no=45 -sectors=100 -mdconfig -a -t malloc -s $sectors -u $no || exit 1 - -echo "1..3" - -geli onetime -d md${no} -if [ -c /dev/md${no}.eli ]; then - echo "ok 1" -else - echo "not ok 1" -fi -# Be sure it doesn't detach on read. -dd if=/dev/md${no}.eli of=/dev/null 2>/dev/null -sleep 1 -if [ -c /dev/md${no}.eli ]; then - echo "ok 2" -else - echo "not ok 2" -fi -true > /dev/md${no}.eli -sleep 1 -if [ ! -c /dev/md${no}.eli ]; then - echo "ok 3" -else - echo "not ok 3" -fi - -mdconfig -d -u $no diff --git a/tools/regression/geom_eli/onetime.t b/tools/regression/geom_eli/onetime.t deleted file mode 100644 index 3a7d67e..0000000 --- a/tools/regression/geom_eli/onetime.t +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -base=`basename $0` -no=45 -sectors=100 - -echo "1..460" - -i=1 -for cipher in aes:0 aes:128 aes:256 \ - aes-xts:0 aes-xts:128 aes-xts:256 \ - aes-cbc:0 aes-cbc:128 aes-cbc:192 aes-cbc:256 \ - 3des:0 3des:192 \ - 3des-cbc:0 3des-cbc:192 \ - blowfish:0 blowfish:128 blowfish:160 blowfish:192 blowfish:224 \ - blowfish:256 blowfish:288 blowfish:320 blowfish:352 blowfish:384 \ - blowfish:416 blowfish:448 \ - blowfish-cbc:0 blowfish-cbc:128 blowfish-cbc:160 blowfish-cbc:192 blowfish-cbc:224 \ - blowfish-cbc:256 blowfish-cbc:288 blowfish-cbc:320 blowfish-cbc:352 blowfish-cbc:384 \ - blowfish-cbc:416 blowfish-cbc:448 \ - camellia:0 camellia:128 camellia:192 camellia:256 \ - camellia-cbc:0 camellia-cbc:128 camellia-cbc:192 camellia-cbc:256; do - ealgo=${cipher%%:*} - keylen=${cipher##*:} - for secsize in 512 1024 2048 4096 8192; do - rnd=`mktemp /tmp/$base.XXXXXX` || exit 1 - mdconfig -a -t malloc -s `expr $secsize \* $sectors`b -u $no || exit 1 - - geli onetime -e $ealgo -l $keylen -s $secsize md${no} 2>/dev/null - - secs=`diskinfo /dev/md${no}.eli | awk '{print $4}'` - - dd if=/dev/random of=${rnd} bs=${secsize} count=${secs} >/dev/null 2>&1 - dd if=${rnd} of=/dev/md${no}.eli bs=${secsize} count=${secs} 2>/dev/null - - md_rnd=`dd if=${rnd} bs=${secsize} count=${secs} 2>/dev/null | md5` - md_ddev=`dd if=/dev/md${no}.eli bs=${secsize} count=${secs} 2>/dev/null | md5` - md_edev=`dd if=/dev/md${no} bs=${secsize} count=${secs} 2>/dev/null | md5` - - if [ ${md_rnd} = ${md_ddev} ]; then - echo "ok $i - ealgo=${ealgo} keylen=${keylen} sec=${secsize}" - else - echo "not ok $i - ealgo=${ealgo} keylen=${keylen} sec=${secsize}" - fi - i=$((i+1)) - if [ ${md_rnd} != ${md_edev} ]; then - echo "ok $i - ealgo=${ealgo} keylen=${keylen} sec=${secsize}" - else - echo "not ok $i - ealgo=${ealgo} keylen=${keylen} sec=${secsize}" - fi - i=$((i+1)) - - geli detach md${no} - rm -f $rnd - mdconfig -d -u $no - done -done diff --git a/tools/regression/geom_eli/readonly.t b/tools/regression/geom_eli/readonly.t deleted file mode 100644 index 210a364..0000000 --- a/tools/regression/geom_eli/readonly.t +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -base=`basename $0` -no=45 -sectors=100 -keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1 -mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1 - -echo "1..11" - -dd if=/dev/random of=${keyfile} bs=512 count=16 >/dev/null 2>&1 - -geli init -B none -P -K $keyfile md${no} -if [ $? -eq 0 ]; then - echo "ok 1" -else - echo "not ok 1" -fi - -geli attach -r -p -k $keyfile md${no} -if [ $? -eq 0 ]; then - echo "ok 2" -else - echo "not ok 2" -fi - -sh -c "true >/dev/md${no}.eli" 2>/dev/null -if [ $? -ne 0 ]; then - echo "ok 3" -else - echo "not ok 3" -fi - -geli kill md${no} -if [ $? -eq 0 ]; then - echo "ok 4" -else - echo "not ok 4" -fi - -# kill should detach provider... -if [ ! -c /dev/md{$no}.eli ]; then - echo "ok 5" -else - echo "not ok 5" -fi - -# ...but not destroy the metadata. -geli attach -r -p -k $keyfile md${no} -if [ $? -eq 0 ]; then - echo "ok 6" -else - echo "not ok 6" -fi - -geli setkey -n 1 -P -K /dev/null md${no} 2>/dev/null -if [ $? -ne 0 ]; then - echo "ok 7" -else - echo "not ok 7" -fi - -geli delkey -n 0 md${no} 2>/dev/null -if [ $? -ne 0 ]; then - echo "ok 8" -else - echo "not ok 8" -fi - -geli delkey -f -n 0 md${no} 2>/dev/null -if [ $? -ne 0 ]; then - echo "ok 9" -else - echo "not ok 9" -fi - -geli list md${no}.eli | egrep '^Flags: .*READ-ONLY' >/dev/null -if [ $? -eq 0 ]; then - echo "ok 10" -else - echo "not ok 10" -fi - -geli detach md${no} -if [ $? -eq 0 ]; then - echo "ok 11" -else - echo "not ok 11" -fi - -mdconfig -d -u $no -rm -f $keyfile diff --git a/tools/regression/geom_eli/resize.t b/tools/regression/geom_eli/resize.t deleted file mode 100644 index 86ee364..0000000 --- a/tools/regression/geom_eli/resize.t +++ /dev/null @@ -1,150 +0,0 @@ -#! /bin/sh -# -# $FreeBSD$ - -echo 1..27 - -BLK=512 -BLKS_PER_MB=2048 - -md=$(mdconfig -s40m) || exit 1 -unit=${md#md} -i=1 - -setsize() { - partszMB=$1 unitszMB=$2 - - { - echo a: $(($partszMB * $BLKS_PER_MB)) 0 4.2BSD 1024 8192 - echo c: $(($unitszMB * $BLKS_PER_MB)) 0 unused 0 0 - } | disklabel -R $md /dev/stdin -} - -# Initialise - -kldload geom_eli >/dev/null 2>&1 - -setsize 10 40 || echo -n "not " -echo ok $i - "Sized ${md}a to 10m" -i=$((i + 1)) - -echo secret >tmp.key -geli init -Bnone -PKtmp.key ${md}a || echo -n "not " -echo ok $i - "Initialised geli on ${md}a" -i=$((i + 1)) -geli attach -pk tmp.key ${md}a || echo -n "not " -echo ok $i - "Attached ${md}a as ${md}a.eli" -i=$((i + 1)) - -newfs -U ${md}a.eli >/dev/null || echo -n "not " -echo ok $i - "Initialised the filesystem on ${md}a.eli" -i=$((i + 1)) -out=$(fsck -tufs -y ${md}a.eli) -echo "$out" | fgrep -q MODIFIED && echo -n "not " -echo ok $i - "fsck says ${md}a.eli is clean," $(echo $(echo "$out" | wc -l)) \ - "lines of output" -i=$((i + 1)) - - -# Doing a backup, resize & restore must be forced (with -f) as geli -# verifies that the provider size in the metadata matches the consumer. - -geli backup ${md}a tmp.meta || echo -n "not " -echo ok $i - "Backed up ${md}a metadata" -i=$((i + 1)) - -geli detach ${md}a.eli || echo -n "not " -echo ok $i - "Detached ${md}a.eli" -i=$((i + 1)) - -setsize 20 40 || echo -n "not " -echo ok $i - "Sized ${md}a to 20m" -i=$((i + 1)) -geli attach -pktmp.key ${md}a && echo -n "not " -echo ok $i - "Attaching ${md}a fails after resizing the consumer" -i=$((i + 1)) - -geli restore tmp.meta ${md}a && echo -n "not " -echo ok $i - "Restoring metadata on ${md}a.eli fails without -f" -i=$((i + 1)) -geli restore -f tmp.meta ${md}a || echo -n "not " -echo ok $i - "Restoring metadata on ${md}a.eli can be forced" -i=$((i + 1)) - -geli attach -pktmp.key ${md}a || echo -n "not " -echo ok $i - "Attaching ${md}a is now possible" -i=$((i + 1)) - -growfs -y ${md}a.eli >/dev/null || echo -n "not " -echo ok $i - "Extended the filesystem on ${md}a.eli" -i=$((i + 1)) - -out=$(fsck -tufs -y ${md}a.eli) -echo "$out" | fgrep -q MODIFIED && echo -n "not " -echo ok $i - "fsck says ${md}a.eli is clean," $(echo $(echo "$out" | wc -l)) \ - "lines of output" -i=$((i + 1)) - - -# Now do the resize properly - -geli detach ${md}a.eli || echo -n "not " -echo ok $i - "Detached ${md}a.eli" -i=$((i + 1)) - -setsize 30 40 || echo -n "not " -echo ok $i - "Sized ${md}a to 30m" -i=$((i + 1)) - -geli resize -s20m ${md}a || echo -n "not " -echo ok $i - "Resizing works ok" -i=$((i + 1)) -geli resize -s20m ${md}a && echo -n "not " -echo ok $i - "Resizing doesn't work a 2nd time (no old metadata)" -i=$((i + 1)) - -geli attach -pktmp.key ${md}a || echo -n "not " -echo ok $i - "Attaching ${md}a works ok" -i=$((i + 1)) - -growfs -y ${md}a.eli >/dev/null || echo -n "not " -echo ok $i - "Extended the filesystem on ${md}a.eli" -i=$((i + 1)) - -out=$(fsck -tufs -y ${md}a.eli) -echo "$out" | fgrep -q MODIFIED && echo -n "not " -echo ok $i - "fsck says ${md}a.eli is clean," $(echo $(echo "$out" | wc -l)) \ - "lines of output" -i=$((i + 1)) - -geli detach ${md}a.eli -gpart destroy -F $md >/dev/null - - -# Verify that the man page example works, changing ada0 to $md, -# 1g to 20m, 2g to 30m and keyfile to tmp.key, and adding -B none -# to geli init. - -gpart create -s GPT $md || echo -n "not " -echo ok $i - "Installed a GPT on ${md}" -i=$((i + 1)) -gpart add -s 20m -t freebsd-ufs -i 1 $md || echo -n "not " -echo ok $i - "Added a 20m partition in slot 1" -i=$((i + 1)) -geli init -B none -K tmp.key -P ${md}p1 || echo -n "not " -echo ok $i - "Initialised geli on ${md}p1" -i=$((i + 1)) -gpart resize -s 30m -i 1 $md || echo -n "not " -echo ok $i - "Resized partition ${md}p1 to 30m" -i=$((i + 1)) -geli resize -s 20m ${md}p1 || echo -n "not " -echo ok $i - "Resized geli on ${md}p1 to 30m" -i=$((i + 1)) -geli attach -k tmp.key -p ${md}p1 || echo -n "not " -echo ok $i - "Attached ${md}p1.eli" -i=$((i + 1)) - -geli detach ${md}p1.eli -mdconfig -du$unit - -rm tmp.* diff --git a/tools/regression/geom_eli/setkey.t b/tools/regression/geom_eli/setkey.t deleted file mode 100644 index 611471a..0000000 --- a/tools/regression/geom_eli/setkey.t +++ /dev/null @@ -1,156 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -base=`basename $0` -no=45 -sectors=100 -rnd=`mktemp /tmp/$base.XXXXXX` || exit 1 -keyfile1=`mktemp /tmp/$base.XXXXXX` || exit 1 -keyfile2=`mktemp /tmp/$base.XXXXXX` || exit 1 -keyfile3=`mktemp /tmp/$base.XXXXXX` || exit 1 -keyfile4=`mktemp /tmp/$base.XXXXXX` || exit 1 -keyfile5=`mktemp /tmp/$base.XXXXXX` || exit 1 -mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1 - -echo "1..16" - -dd if=/dev/random of=${rnd} bs=512 count=${sectors} >/dev/null 2>&1 -hash1=`dd if=${rnd} bs=512 count=${sectors} 2>/dev/null | md5` -dd if=/dev/random of=${keyfile1} bs=512 count=16 >/dev/null 2>&1 -dd if=/dev/random of=${keyfile2} bs=512 count=16 >/dev/null 2>&1 -dd if=/dev/random of=${keyfile3} bs=512 count=16 >/dev/null 2>&1 -dd if=/dev/random of=${keyfile4} bs=512 count=16 >/dev/null 2>&1 -dd if=/dev/random of=${keyfile5} bs=512 count=16 >/dev/null 2>&1 - -geli init -B none -P -K $keyfile1 md${no} -geli attach -p -k $keyfile1 md${no} - -dd if=${rnd} of=/dev/md${no}.eli bs=512 count=${sectors} 2>/dev/null -rm -f $rnd -hash2=`dd if=/dev/md${no}.eli bs=512 count=${sectors} 2>/dev/null | md5` - -# Change current key (0) for attached provider. -geli setkey -P -K $keyfile2 md${no} -if [ $? -eq 0 ]; then - echo "ok 1" -else - echo "not ok 1" -fi -geli detach md${no} - -# We cannot use keyfile1 anymore. -geli attach -p -k $keyfile1 md${no} 2>/dev/null -if [ $? -ne 0 ]; then - echo "ok 2" -else - echo "not ok 2" -fi - -# Attach with new key. -geli attach -p -k $keyfile2 md${no} -if [ $? -eq 0 ]; then - echo "ok 3" -else - echo "not ok 3" -fi -hash3=`dd if=/dev/md${no}.eli bs=512 count=${sectors} 2>/dev/null | md5` - -# Change key 1 for attached provider. -geli setkey -n 1 -P -K $keyfile3 md${no} -if [ $? -eq 0 ]; then - echo "ok 4" -else - echo "not ok 4" -fi -geli detach md${no} - -# Attach with key 1. -geli attach -p -k $keyfile3 md${no} -if [ $? -eq 0 ]; then - echo "ok 5" -else - echo "not ok 5" -fi -hash4=`dd if=/dev/md${no}.eli bs=512 count=${sectors} 2>/dev/null | md5` -geli detach md${no} - -# Change current (1) key for detached provider. -geli setkey -p -k $keyfile3 -P -K $keyfile4 md${no} -if [ $? -eq 0 ]; then - echo "ok 6" -else - echo "not ok 6" -fi - -# We cannot use keyfile3 anymore. -geli attach -p -k $keyfile3 md${no} 2>/dev/null -if [ $? -ne 0 ]; then - echo "ok 7" -else - echo "not ok 7" -fi - -# Attach with key 1. -geli attach -p -k $keyfile4 md${no} -if [ $? -eq 0 ]; then - echo "ok 8" -else - echo "not ok 8" -fi -hash5=`dd if=/dev/md${no}.eli bs=512 count=${sectors} 2>/dev/null | md5` -geli detach md${no} - -# Change key 0 for detached provider. -geli setkey -n 0 -p -k $keyfile4 -P -K $keyfile5 md${no} -if [ $? -eq 0 ]; then - echo "ok 9" -else - echo "not ok 9" -fi - -# We cannot use keyfile2 anymore. -geli attach -p -k $keyfile2 md${no} 2>/dev/null -if [ $? -ne 0 ]; then - echo "ok 10" -else - echo "not ok 10" -fi - -# Attach with key 0. -geli attach -p -k $keyfile5 md${no} -if [ $? -eq 0 ]; then - echo "ok 11" -else - echo "not ok 11" -fi -hash6=`dd if=/dev/md${no}.eli bs=512 count=${sectors} 2>/dev/null | md5` -geli detach md${no} - -if [ ${hash1} = ${hash2} ]; then - echo "ok 12" -else - echo "not ok 12" -fi -if [ ${hash1} = ${hash3} ]; then - echo "ok 13" -else - echo "not ok 13" -fi -if [ ${hash1} = ${hash4} ]; then - echo "ok 14" -else - echo "not ok 14" -fi -if [ ${hash1} = ${hash5} ]; then - echo "ok 15" -else - echo "not ok 15" -fi -if [ ${hash1} = ${hash6} ]; then - echo "ok 16" -else - echo "not ok 16" -fi - -mdconfig -d -u $no -rm -f $keyfile1 $keyfile2 $keyfile3 $keyfile4 $keyfile5 diff --git a/tools/regression/geom_gate/Makefile b/tools/regression/geom_gate/Makefile deleted file mode 100644 index c5c24ad..0000000 --- a/tools/regression/geom_gate/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# -# $FreeBSD$ -# -# Regression tests for geom_gate. -# - -test: - @sh runtests.sh diff --git a/tools/regression/geom_gate/runtests.sh b/tools/regression/geom_gate/runtests.sh deleted file mode 100644 index 38089c5..0000000 --- a/tools/regression/geom_gate/runtests.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -dir=`dirname $0` - -for ts in `dirname $0`/test-*.sh; do - sh $ts -done diff --git a/tools/regression/geom_gate/test-1.sh b/tools/regression/geom_gate/test-1.sh deleted file mode 100644 index 44a4960..0000000 --- a/tools/regression/geom_gate/test-1.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -base=`basename $0` -us=45 -work="/dev/md${us}" -src="/dev/md`expr $us + 1`" -conf=`mktemp /tmp/$base.XXXXXX` || exit 1 - -mdconfig -a -t malloc -s 1M -u $us || exit 1 -mdconfig -a -t malloc -s 1M -u `expr $us + 1` || exit 1 -dd if=/dev/random of=$work bs=1m count=1 >/dev/null 2>&1 -dd if=/dev/random of=$src bs=1m count=1 >/dev/null 2>&1 -sum=`cat $src | md5 -q` - -echo "127.0.0.1 RW $work" > $conf -ggated $conf -ggatec create -u $us 127.0.0.1 $work - -dd if=${src} of=/dev/ggate${us} bs=1m count=1 >/dev/null 2>&1 - -if [ `cat $work | md5 -q` != $sum ]; then - echo "FAIL" -else - if [ `cat /dev/ggate${us} | md5 -q` != $sum ]; then - echo "FAIL" - else - echo "PASS" - fi -fi - -ggatec destroy -u $us -mdconfig -d -u $us -mdconfig -d -u `expr $us + 1` -pkill ggated $conf -rm -f $conf diff --git a/tools/regression/geom_gate/test-1.t b/tools/regression/geom_gate/test-1.t deleted file mode 100644 index 279e316..0000000 --- a/tools/regression/geom_gate/test-1.t +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -base=`basename $0` -us=45 -work="/dev/md${us}" -src="/dev/md`expr $us + 1`" -conf=`mktemp /tmp/$base.XXXXXX` || exit 1 - -mdconfig -a -t malloc -s 1M -u $us || exit 1 -mdconfig -a -t malloc -s 1M -u `expr $us + 1` || exit 1 -dd if=/dev/random of=$work bs=1m count=1 >/dev/null 2>&1 -dd if=/dev/random of=$src bs=1m count=1 >/dev/null 2>&1 -sum=`cat $src | md5 -q` - -echo "127.0.0.1 RW $work" > $conf -ggated $conf -ggatec create -u $us 127.0.0.1 $work - -dd if=${src} of=/dev/ggate${us} bs=1m count=1 >/dev/null 2>&1 - -echo '1..2' - -if [ `cat $work | md5 -q` != $sum ]; then - echo 'not ok 1 - md5 checksum' -else - echo 'ok 1 - md5 checksum' - - if [ `cat /dev/ggate${us} | md5 -q` != $sum ]; then - echo 'not ok 2 - md5 checksum' - else - echo 'ok 2 - md5 checksum' - fi -fi - -ggatec destroy -u $us -mdconfig -d -u $us -mdconfig -d -u `expr $us + 1` -pkill ggated $conf -rm -f $conf diff --git a/tools/regression/geom_gate/test-2.sh b/tools/regression/geom_gate/test-2.sh deleted file mode 100644 index 498ac45..0000000 --- a/tools/regression/geom_gate/test-2.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -base=`basename $0` -us=45 -work=`mktemp /tmp/$base.XXXXXX` || exit 1 -src=`mktemp /tmp/$base.XXXXXX` || exit 1 - -dd if=/dev/random of=$work bs=1m count=1 >/dev/null 2>&1 -dd if=/dev/random of=$src bs=1m count=1 >/dev/null 2>&1 -sum=`md5 -q $src` - -ggatel create -u $us $work - -dd if=${src} of=/dev/ggate${us} bs=1m count=1 >/dev/null 2>&1 - -if [ `md5 -q $work` != $sum ]; then - echo "FAIL" -else - if [ `cat /dev/ggate${us} | md5 -q` != $sum ]; then - echo "FAIL" - else - echo "PASS" - fi -fi - -ggatel destroy -u $us -rm -f $work $src diff --git a/tools/regression/geom_gate/test-2.t b/tools/regression/geom_gate/test-2.t deleted file mode 100644 index 2e5e254..0000000 --- a/tools/regression/geom_gate/test-2.t +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -base=`basename $0` -us=45 -work=`mktemp /tmp/$base.XXXXXX` || exit 1 -src=`mktemp /tmp/$base.XXXXXX` || exit 1 - -dd if=/dev/random of=$work bs=1m count=1 >/dev/null 2>&1 -dd if=/dev/random of=$src bs=1m count=1 >/dev/null 2>&1 -sum=`md5 -q $src` - -ggatel create -u $us $work - -dd if=${src} of=/dev/ggate${us} bs=1m count=1 >/dev/null 2>&1 - -echo '1..2' - -if [ `md5 -q $work` != $sum ]; then - echo 'not ok 1 - md5 checksum' -else - echo 'ok 1 - md5 checksum' - if [ `cat /dev/ggate${us} | md5 -q` != $sum ]; then - echo 'not ok 2 - md5 checksum' - else - echo 'ok 2 - md5 checksum' - fi -fi - -ggatel destroy -u $us -rm -f $work $src diff --git a/tools/regression/geom_gate/test-3.sh b/tools/regression/geom_gate/test-3.sh deleted file mode 100644 index ca73a5a..0000000 --- a/tools/regression/geom_gate/test-3.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -base=`basename $0` -us=45 -work="/dev/md${us}" -src="/dev/md`expr $us + 1`" - -mdconfig -a -t malloc -s 1M -u $us || exit 1 -mdconfig -a -t malloc -s 1M -u `expr $us + 1` || exit 1 -dd if=/dev/random of=$work bs=1m count=1 >/dev/null 2>&1 -dd if=/dev/random of=$src bs=1m count=1 >/dev/null 2>&1 -sum=`cat $src | md5 -q` - -ggatel create -u $us $work - -dd if=${src} of=/dev/ggate${us} bs=1m count=1 >/dev/null 2>&1 - -if [ `cat $work | md5 -q` != $sum ]; then - echo "FAIL" -else - if [ `cat /dev/ggate${us} | md5 -q` != $sum ]; then - echo "FAIL" - else - echo "PASS" - fi -fi - -ggatel destroy -u $us -mdconfig -d -u $us -mdconfig -d -u `expr $us + 1` diff --git a/tools/regression/geom_gate/test-3.t b/tools/regression/geom_gate/test-3.t deleted file mode 100644 index ba2b3c7..0000000 --- a/tools/regression/geom_gate/test-3.t +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -base=`basename $0` -us=45 -work="/dev/md${us}" -src="/dev/md`expr $us + 1`" - -mdconfig -a -t malloc -s 1M -u $us || exit 1 -mdconfig -a -t malloc -s 1M -u `expr $us + 1` || exit 1 -dd if=/dev/random of=$work bs=1m count=1 >/dev/null 2>&1 -dd if=/dev/random of=$src bs=1m count=1 >/dev/null 2>&1 -sum=`cat $src | md5 -q` - -ggatel create -u $us $work - -dd if=${src} of=/dev/ggate${us} bs=1m count=1 >/dev/null 2>&1 - -echo '1..2' - -if [ `cat $work | md5 -q` != $sum ]; then - echo 'not ok 1 - md5 checksum' -else - echo 'ok 1 - md5 checksum' - if [ `cat /dev/ggate${us} | md5 -q` != $sum ]; then - echo 'not ok 2 - md5 checksum' - else - echo 'ok 2 - md5 checksum' - fi -fi - -ggatel destroy -u $us -mdconfig -d -u $us -mdconfig -d -u `expr $us + 1` diff --git a/tools/regression/geom_gpt/gctl.t b/tools/regression/geom_gpt/gctl.t deleted file mode 100644 index f99e6d8..0000000 --- a/tools/regression/geom_gpt/gctl.t +++ /dev/null @@ -1,207 +0,0 @@ -#!/usr/bin/env perl -w -# -# Copyright (c) 2005, 2006 Marcel Moolenaar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# $FreeBSD$ - -my $srcdir = `dirname $0`; -chomp $srcdir; - -my $cmd = "/tmp/gctl-$$"; -my $out = "$cmd.out"; -my $disk = "/tmp/disk-$$"; -my $mntpt = "/tmp/mount-$$"; - -my %steps = ( - "000" => "gctl", - "001" => "gctl verb=bogus", - "010" => "gctl verb=create", - "011" => "gctl 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%", - "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", - "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%", - "120" => "mdcfg destroy", -); - -my %result = ( - "000" => "FAIL Verb missing", - "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 87 entry", - "025" => "b1856477950e5786898c8f01361196cf", - "030" => "FAIL 87 geom", - "031" => "FAIL 22 geom 'bogus'", - "032" => "FAIL 87 type", - "033" => "FAIL 22 type 'bogus'", - "034" => "FAIL 87 start", - "035" => "FAIL 22 start 1", - "036" => "FAIL 87 end", - "037" => "FAIL 22 end 12345678", - "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%'", - "120" => "", -); - -my $verbose = ""; -if (exists $ENV{'TEST_VERBOSE'}) { - $verbose = "-v"; -} - -# Compile the driver... -my $st = system("cc -o $cmd -g $srcdir/test.c -lgeom"); -if ($st != 0) { - print "1..0 # SKIP error compiling test.c\n"; - exit 0; -} - -# Make sure we have permission to use gctl... -if (`$cmd` =~ "^FAIL Permission denied") { - print "1..0 # SKIP not enough permission\n"; - unlink $cmd; - exit 0; -} - -$count = keys (%steps); -print "1..$count\n"; - -my $nr = 1; -my $dev = "n/a"; -foreach my $key (sort keys %steps) { - my ($action, $args) = split(/ /, $steps{$key}, 2); - my $res = $result{$key}; - $args = "" if (not defined $args); - $args =~ s/%dev%/$dev/g; - $res =~ s/%dev%/$dev/g; - - if ($action =~ "^gctl") { - system("$cmd $verbose $args | tee $out 2>&1"); - $st = `tail -1 $out`; - if ($st =~ "^$res") { - print "ok $nr \# gctl($key)\n"; - } else { - print "not ok $nr \# gctl($key) - $st\n"; - } - unlink $out; - } 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") { - $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 | 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; -} - -unlink $cmd; -exit 0; diff --git a/tools/regression/geom_gpt/test.c b/tools/regression/geom_gpt/test.c deleted file mode 100644 index d750d30..0000000 --- a/tools/regression/geom_gpt/test.c +++ /dev/null @@ -1,165 +0,0 @@ -/*- - * Copyright (c) 2005, 2006 Marcel Moolenaar - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include -__FBSDID("$FreeBSD$"); - -#include -#include -#include -#include -#include -#include -#include -#include - -struct retval { - struct retval *retval; - const char *param; - char *value; -}; - -struct retval *retval; -int verbose; - -static void -usage() -{ - fprintf(stdout, "usage: %s [-v] param[:len][=value] ...\n", - getprogname()); - exit(1); -} - -static int -parse(char *arg, char **param, char **value, int *len) -{ - char *e, *colon, *equal; - - if (*arg == '\0') - return (EINVAL); - - colon = strchr(arg, ':'); - equal = strchr(arg, '='); - if (colon == NULL && equal == NULL) - return (EINVAL); - if (colon == arg || equal == arg) - return (EINVAL); - if (colon != NULL && equal != NULL && equal < colon) - return (EINVAL); - - if (colon != NULL) - *colon++ = '\0'; - if (equal != NULL) - *equal++ = '\0'; - - *param = arg; - if (colon != NULL) { - /* Length specification. This parameter is RW. */ - if (*colon == '\0') - return (EINVAL); - *len = strtol(colon, &e, 0); - if (*e != '\0') - return (EINVAL); - if (*len <= 0 || *len > PATH_MAX) - return (EINVAL); - *value = malloc(*len); - if (*value == NULL) - return (ENOMEM); - memset(*value, 0, *len); - if (equal != NULL) { - if (strlen(equal) >= PATH_MAX) - return (ENOMEM); - strcpy(*value, equal); - } - } else { - /* This parameter is RO. */ - *len = -1; - if (*equal == '\0') - return (EINVAL); - *value = equal; - } - - return (0); -} - -int main(int argc, char *argv[]) -{ - struct retval *rv; - struct gctl_req *req; - char *param, *value; - const char *s; - int c, len; - - req = gctl_get_handle(); - gctl_ro_param(req, "class", -1, "GPT"); - - while ((c = getopt(argc, argv, "v")) != -1) { - switch (c) { - case 'v': - verbose = 1; - break; - case '?': - default: - usage(); - /* NOTREACHED */ - break; - } - } - - while (optind < argc) { - if (!parse(argv[optind++], ¶m, &value, &len)) { - if (len > 0) { - rv = malloc(sizeof(struct retval)); - rv->param = param; - rv->value = value; - rv->retval = retval; - retval = rv; - gctl_rw_param(req, param, len, value); - } else - gctl_ro_param(req, param, -1, value); - } - } - - if (verbose) - gctl_dump(req, stdout); - - s = gctl_issue(req); - if (s == NULL) { - printf("PASS"); - while (retval != NULL) { - rv = retval->retval; - printf(" %s=%s", retval->param, retval->value); - free(retval->value); - free(retval); - retval = rv; - } - printf("\n"); - } else - printf("FAIL %s\n", s); - - gctl_free(req); - return (0); -} diff --git a/tools/regression/geom_mirror/conf.sh b/tools/regression/geom_mirror/conf.sh deleted file mode 100644 index 8a60a16..0000000 --- a/tools/regression/geom_mirror/conf.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -name="test" -class="mirror" -base=`basename $0` - -. `dirname $0`/../geom_subr.sh diff --git a/tools/regression/geom_mirror/test-1.t b/tools/regression/geom_mirror/test-1.t deleted file mode 100644 index b07a8d1..0000000 --- a/tools/regression/geom_mirror/test-1.t +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo "1..1" - -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` - -mdconfig -a -t malloc -s 1M -u $us0 || exit 1 -mdconfig -a -t malloc -s 2M -u $us1 || exit 1 -mdconfig -a -t malloc -s 3M -u $us2 || exit 1 - -gmirror label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 -devwait - -# Size of created device should be 1MB - 512b. - -size=`diskinfo /dev/mirror/${name} | awk '{print $3}'` - -if [ $size -eq 1048064 ]; then - echo "ok 1" -else - echo "not ok 1" -fi - -gmirror remove $name md${us0} -gmirror remove $name md${us1} -gmirror remove $name md${us2} -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 diff --git a/tools/regression/geom_mirror/test-2.t b/tools/regression/geom_mirror/test-2.t deleted file mode 100644 index 3fb0822..0000000 --- a/tools/regression/geom_mirror/test-2.t +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo "1..4" - -balance="round-robin" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` -ddbs=2048 -nblocks1=1024 -nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 - -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 - -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1 - -gmirror label -b $balance $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 -devwait - -dd if=${src} of=/dev/mirror/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 - -dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 1" -else - echo "ok 1" -fi -dd if=/dev/md${us0} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 2" -else - echo "ok 2" -fi -dd if=/dev/md${us1} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 3" -else - echo "ok 3" -fi - -dd if=/dev/md${us2} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 4" -else - echo "ok 4" -fi - -gmirror remove $name md${us0} md${us1} md${us2} -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 -rm -f ${src} ${dst} diff --git a/tools/regression/geom_mirror/test-3.t b/tools/regression/geom_mirror/test-3.t deleted file mode 100644 index 5bdd2ab..0000000 --- a/tools/regression/geom_mirror/test-3.t +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo "1..5" - -balance="round-robin" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` -ddbs=2048 -nblocks1=1024 -nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 - -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 - -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1 - -gmirror label -b $balance $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 -devwait - -dd if=${src} of=/dev/mirror/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 - -dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 1" -else - echo "ok 1" -fi - -gmirror remove $name md${us0} -dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 2" -else - echo "ok 2" -fi - -gmirror remove $name md${us1} -dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 3" -else - echo "ok 3" -fi - -gmirror remove $name md${us2} -dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 4" -else - echo "ok 4" -fi - -# mirror/${name} should be removed. -if [ -c /dev/${name} ]; then - echo "not ok 5" -else - echo "ok 5" -fi - -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 -rm -f ${src} ${dst} diff --git a/tools/regression/geom_mirror/test-4.t b/tools/regression/geom_mirror/test-4.t deleted file mode 100644 index 0786bdb..0000000 --- a/tools/regression/geom_mirror/test-4.t +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo "1..5" - -balance="load" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` -ddbs=2048 -nblocks1=1024 -nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 - -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 - -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1 - -gmirror label -b $balance $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 -devwait - -dd if=${src} of=/dev/mirror/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 - -dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 1" -else - echo "ok 1" -fi - -gmirror remove $name md${us0} -dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 2" -else - echo "ok 2" -fi - -gmirror remove $name md${us1} -dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 3" -else - echo "ok 3" -fi - -gmirror remove $name md${us2} -dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 4" -else - echo "ok 4" -fi - -# mirror/${name} should be removed. -if [ -c /dev/${name} ]; then - echo "not ok 5" -else - echo "ok 5" -fi - -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 -rm -f ${src} ${dst} diff --git a/tools/regression/geom_mirror/test-5.t b/tools/regression/geom_mirror/test-5.t deleted file mode 100644 index 5b0a5ed..0000000 --- a/tools/regression/geom_mirror/test-5.t +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo "1..5" - -balance="split" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` -ddbs=8192 -nblocks1=1024 -nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 - -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 - -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1 - -gmirror label -b $balance -s `expr $ddbs / 2` $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 -devwait - -dd if=${src} of=/dev/mirror/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 - -dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 1" -else - echo "ok 1" -fi - -gmirror remove $name md${us0} -dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 2" -else - echo "ok 2" -fi - -gmirror remove $name md${us1} -dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 3" -else - echo "ok 3" -fi - -gmirror remove $name md${us2} -dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 4" -else - echo "ok 4" -fi - -# mirror/${name} should be removed. -if [ -c /dev/${name} ]; then - echo "not ok 5" -else - echo "ok 5" -fi - -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 -rm -f ${src} ${dst} diff --git a/tools/regression/geom_mirror/test-6.t b/tools/regression/geom_mirror/test-6.t deleted file mode 100644 index ec86d06..0000000 --- a/tools/regression/geom_mirror/test-6.t +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo "1..2" - -balance="split" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` -ddbs=8192 -nblocks1=1024 -nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 - -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 - -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1 - -gmirror label -b $balance -s `expr $ddbs / 2` $name /dev/md${us0} /dev/md${us1} || exit 1 -devwait - -dd if=${src} of=/dev/mirror/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -dd if=/dev/zero of=/dev/md${us2} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 - -dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 1" -else - echo "ok 1" -fi - -# Connect disk to the mirror. -gmirror insert ${name} md${us2} -# Wait for synchronization. -sleep 1 -dd if=/dev/md${us2} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 2" -else - echo "ok 2" -fi - -gmirror remove $name md${us0} md${us1} md${us2} -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 -rm -f ${src} ${dst} diff --git a/tools/regression/geom_mirror/test-7.t b/tools/regression/geom_mirror/test-7.t deleted file mode 100644 index c911c03..0000000 --- a/tools/regression/geom_mirror/test-7.t +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo "1..5" - -balance="prefer" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` -ddbs=2048 -nblocks1=1024 -nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 - -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 - -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1 - -gmirror label -b $balance $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 -devwait - -dd if=${src} of=/dev/mirror/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 - -dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 1" -else - echo "ok 1" -fi - -gmirror remove $name md${us0} -dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 2" -else - echo "ok 2" -fi - -gmirror remove $name md${us1} -dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 3" -else - echo "ok 3" -fi - -gmirror remove $name md${us2} -dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 4" -else - echo "ok 4" -fi - -# mirror/${name} should be removed. -if [ -c /dev/${name} ]; then - echo "not ok 5" -else - echo "ok 5" -fi - -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 -rm -f ${src} ${dst} diff --git a/tools/regression/geom_nop/conf.sh b/tools/regression/geom_nop/conf.sh deleted file mode 100644 index 0dc9797..0000000 --- a/tools/regression/geom_nop/conf.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -class="nop" -base=`basename $0` - -. `dirname $0`/../geom_subr.sh diff --git a/tools/regression/geom_nop/test-1.t b/tools/regression/geom_nop/test-1.t deleted file mode 100644 index f08f71d..0000000 --- a/tools/regression/geom_nop/test-1.t +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo "1..1" - -us=45 - -mdconfig -a -t malloc -s 1M -u $us || exit 1 - -gnop create /dev/md${us} || exit 1 - -# Size of created device should be 1MB. - -size=`diskinfo /dev/md${us}.nop | awk '{print $3}'` - -if [ $size -eq 1048576 ]; then - echo "ok 1" -else - echo "not ok 1" -fi - -gnop destroy md${us}.nop -mdconfig -d -u $us diff --git a/tools/regression/geom_nop/test-2.t b/tools/regression/geom_nop/test-2.t deleted file mode 100644 index e0ddb17..0000000 --- a/tools/regression/geom_nop/test-2.t +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -us=45 -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 - -echo "1..1" - -dd if=/dev/random of=${src} bs=1m count=1 >/dev/null 2>&1 - -mdconfig -a -t malloc -s 1M -u $us || exit 1 - -gnop create /dev/md${us} || exit 1 - -dd if=${src} of=/dev/md${us}.nop bs=1m count=1 >/dev/null 2>&1 -dd if=/dev/md${us}.nop of=${dst} bs=1m count=1 >/dev/null 2>&1 - -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 1" -else - echo "ok 1" -fi - -gnop destroy md${us}.nop -mdconfig -d -u $us -rm -f ${src} ${dst} diff --git a/tools/regression/geom_raid3/conf.sh b/tools/regression/geom_raid3/conf.sh deleted file mode 100644 index 93e7dea..0000000 --- a/tools/regression/geom_raid3/conf.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -name="test" -class="raid3" -base=`basename $0` - -. `dirname $0`/../geom_subr.sh diff --git a/tools/regression/geom_raid3/test-1.t b/tools/regression/geom_raid3/test-1.t deleted file mode 100644 index 9202967..0000000 --- a/tools/regression/geom_raid3/test-1.t +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo "1..2" - -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` - -mdconfig -a -t malloc -s 1M -u $us0 || exit 1 -mdconfig -a -t malloc -s 2M -u $us1 || exit 1 -mdconfig -a -t malloc -s 3M -u $us2 || exit 1 - -graid3 label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} 2>/dev/null || exit 1 -devwait - -# Size of created device should be 2MB - 1024B. - -mediasize=`diskinfo /dev/raid3/${name} | awk '{print $3}'` -if [ $mediasize -eq 2096128 ]; then - echo "ok 1" -else - echo "not ok 1" -fi -sectorsize=`diskinfo /dev/raid3/${name} | awk '{print $2}'` -if [ $sectorsize -eq 1024 ]; then - echo "ok 2" -else - echo "not ok 2" -fi - -graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 diff --git a/tools/regression/geom_raid3/test-10.t b/tools/regression/geom_raid3/test-10.t deleted file mode 100644 index 1320120..0000000 --- a/tools/regression/geom_raid3/test-10.t +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo "1..1" - -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` -ddbs=2048 -nblocks1=1024 -nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 - -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 - -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1 - -graid3 label -r $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 -devwait - -dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 - -dd if=/dev/raid3/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 1" -else - echo "ok 1" -fi - -graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 -rm -f ${src} ${dst} diff --git a/tools/regression/geom_raid3/test-11.t b/tools/regression/geom_raid3/test-11.t deleted file mode 100644 index 3382214..0000000 --- a/tools/regression/geom_raid3/test-11.t +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo "1..1" - -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` -ddbs=2048 -nblocks1=1024 -nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 - -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 - -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1 - -graid3 label -w $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 -devwait - -dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 - -dd if=/dev/raid3/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 1" -else - echo "ok 1" -fi - -graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 -rm -f ${src} ${dst} diff --git a/tools/regression/geom_raid3/test-12.t b/tools/regression/geom_raid3/test-12.t deleted file mode 100644 index 3dec406..0000000 --- a/tools/regression/geom_raid3/test-12.t +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo "1..1" - -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` -nblocks1=9 -nblocks2=`expr $nblocks1 - 1` -nblocks3=`expr $nblocks2 / 2` - -mdconfig -a -t malloc -s $nblocks1 -u $us0 || exit 1 -mdconfig -a -t malloc -s $nblocks1 -u $us1 || exit 1 -mdconfig -a -t malloc -s $nblocks1 -u $us2 || exit 1 - -dd if=/dev/random of=/dev/md${us0} count=$nblocks1 >/dev/null 2>&1 -dd if=/dev/random of=/dev/md${us1} count=$nblocks1 >/dev/null 2>&1 -dd if=/dev/random of=/dev/md${us2} count=$nblocks1 >/dev/null 2>&1 - -graid3 label -w $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 -devwait -# Wait for synchronization. -sleep 2 -graid3 stop $name -# Break one component. -dd if=/dev/random of=/dev/md${us1} count=$nblocks2 >/dev/null 2>&1 -# Provoke retaste of the rest components. -true > /dev/md${us0} -true > /dev/md${us2} -sleep 1 - -dd if=/dev/raid3/${name} of=/dev/null bs=1k count=$nblocks3 >/dev/null 2>&1 -ec=$? -if [ $ec -eq 0 ]; then - echo "not ok 1" -else - echo "ok 1" -fi - -graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 diff --git a/tools/regression/geom_raid3/test-2.t b/tools/regression/geom_raid3/test-2.t deleted file mode 100644 index 88daf78..0000000 --- a/tools/regression/geom_raid3/test-2.t +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo "1..1" - -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` -ddbs=2048 -nblocks1=1024 -nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 - -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 - -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1 - -graid3 label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 -devwait - -dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 - -dd if=/dev/raid3/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 1" -else - echo "ok 1" -fi - -graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 -rm -f ${src} ${dst} diff --git a/tools/regression/geom_raid3/test-3.t b/tools/regression/geom_raid3/test-3.t deleted file mode 100644 index d2c1a5f..0000000 --- a/tools/regression/geom_raid3/test-3.t +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo "1..1" - -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` -ddbs=2048 -nblocks1=1024 -nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 - -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 - -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1 - -graid3 label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 -devwait - -dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 - -# -# Reading without one DATA component (so with parity). -# -graid3 remove -n 1 $name -dd if=/dev/raid3/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 1" -else - echo "ok 1" -fi - -graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 -rm -f ${src} ${dst} diff --git a/tools/regression/geom_raid3/test-4.t b/tools/regression/geom_raid3/test-4.t deleted file mode 100644 index d437ec0..0000000 --- a/tools/regression/geom_raid3/test-4.t +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo "1..1" - -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` -ddbs=2048 -nblocks1=1024 -nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 - -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 - -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1 - -graid3 label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 -devwait - -# -# Writing without one DATA component. -# -graid3 remove -n 1 $name -dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 - -dd if=/dev/raid3/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 1" -else - echo "ok 1" -fi - -graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 -rm -f ${src} ${dst} diff --git a/tools/regression/geom_raid3/test-5.t b/tools/regression/geom_raid3/test-5.t deleted file mode 100644 index ffd85f6..0000000 --- a/tools/regression/geom_raid3/test-5.t +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo "1..1" - -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` -ddbs=2048 -nblocks1=1024 -nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 - -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 - -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1 - -graid3 label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 -devwait - -# -# Writing without PARITY component. -# -graid3 remove -n 2 $name -dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 - -dd if=/dev/raid3/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 1" -else - echo "ok 1" -fi - -graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 -rm -f ${src} ${dst} diff --git a/tools/regression/geom_raid3/test-6.t b/tools/regression/geom_raid3/test-6.t deleted file mode 100644 index 97b5503..0000000 --- a/tools/regression/geom_raid3/test-6.t +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo "1..1" - -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` -ddbs=2048 -nblocks1=1024 -nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 - -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 - -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1 - -graid3 label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 -devwait - -dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 - -# -# Rebuild of DATA component. -# -graid3 remove -n 1 $name -dd if=/dev/zero of=/dev/md${us1} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1 -graid3 insert -n 1 $name md${us1} -sleep 1 - -dd if=/dev/raid3/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 1" -else - echo "ok 1" -fi - -graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 -rm -f ${src} ${dst} diff --git a/tools/regression/geom_raid3/test-7.t b/tools/regression/geom_raid3/test-7.t deleted file mode 100644 index 3d89873..0000000 --- a/tools/regression/geom_raid3/test-7.t +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo "1..1" - -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` -ddbs=2048 -nblocks1=1024 -nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 - -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 - -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1 - -graid3 label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 -devwait - -dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 - -# -# Rebuild of PARITY component. -# -graid3 remove -n 2 $name -dd if=/dev/zero of=/dev/md${us2} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1 -graid3 insert -n 2 $name md${us2} -sleep 1 -# Remove DATA component, so PARITY component can be used while reading. -graid3 remove -n 1 $name -dd if=/dev/zero of=/dev/md${us1} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1 - -dd if=/dev/raid3/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 1" -else - echo "ok 1" -fi - -graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 -rm -f ${src} ${dst} diff --git a/tools/regression/geom_raid3/test-8.t b/tools/regression/geom_raid3/test-8.t deleted file mode 100644 index b9621f4..0000000 --- a/tools/regression/geom_raid3/test-8.t +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo "1..1" - -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` -ddbs=2048 -nblocks1=1024 -nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 - -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 - -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1 - -graid3 label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 -devwait - -# -# Writing without DATA component and rebuild of DATA component. -# -graid3 remove -n 1 $name -dd if=/dev/zero of=/dev/md${us1} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1 -dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -graid3 insert -n 1 $name md${us1} -sleep 1 - -dd if=/dev/raid3/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 1" -else - echo "ok 1" -fi - -graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 -rm -f ${src} ${dst} diff --git a/tools/regression/geom_raid3/test-9.t b/tools/regression/geom_raid3/test-9.t deleted file mode 100644 index 0695011..0000000 --- a/tools/regression/geom_raid3/test-9.t +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo "1..1" - -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` -ddbs=2048 -nblocks1=1024 -nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 - -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 - -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1 -mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1 - -graid3 label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 -devwait - -# -# Writing without PARITY component and rebuild of PARITY component. -# -graid3 remove -n 2 $name -dd if=/dev/zero of=/dev/md${us2} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1 -dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -graid3 insert -n 2 $name md${us2} -sleep 1 -# Remove DATA component, so PARITY component can be used while reading. -graid3 remove -n 1 $name -dd if=/dev/zero of=/dev/md${us1} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1 - -dd if=/dev/raid3/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 1" -else - echo "ok 1" -fi - -graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 -rm -f ${src} ${dst} diff --git a/tools/regression/geom_shsec/conf.sh b/tools/regression/geom_shsec/conf.sh deleted file mode 100644 index 7648862..0000000 --- a/tools/regression/geom_shsec/conf.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -name="test" -class="shsec" -base=`basename $0` - -. `dirname $0`/../geom_subr.sh diff --git a/tools/regression/geom_shsec/test-1.t b/tools/regression/geom_shsec/test-1.t deleted file mode 100644 index 5cb5b4f..0000000 --- a/tools/regression/geom_shsec/test-1.t +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo "1..2" - -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` - -mdconfig -a -t malloc -s 1M -u $us0 || exit 1 -mdconfig -a -t malloc -s 2M -u $us1 || exit 1 -mdconfig -a -t malloc -s 3M -u $us2 || exit 1 - -gshsec label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} 2>/dev/null || exit 1 -devwait - -# Size of created device should be 1MB - 512B. - -mediasize=`diskinfo /dev/shsec/${name} | awk '{print $3}'` -if [ $mediasize -eq 1048064 ]; then - echo "ok 1" -else - echo "not ok 1" -fi -sectorsize=`diskinfo /dev/shsec/${name} | awk '{print $2}'` -if [ $sectorsize -eq 512 ]; then - echo "ok 2" -else - echo "not ok 2" -fi - -gshsec stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 diff --git a/tools/regression/geom_shsec/test-2.t b/tools/regression/geom_shsec/test-2.t deleted file mode 100644 index 19a4e0a..0000000 --- a/tools/regression/geom_shsec/test-2.t +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo "1..4" - -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` -nblocks1=1024 -nblocks2=`expr $nblocks1 + 1` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 - -dd if=/dev/random of=${src} count=$nblocks1 >/dev/null 2>&1 - -mdconfig -a -t malloc -s $nblocks2 -u $us0 || exit 1 -mdconfig -a -t malloc -s $nblocks2 -u $us1 || exit 1 -mdconfig -a -t malloc -s $nblocks2 -u $us2 || exit 1 - -gshsec label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 -devwait - -dd if=${src} of=/dev/shsec/${name} count=$nblocks1 >/dev/null 2>&1 - -dd if=/dev/shsec/${name} of=${dst} count=$nblocks1 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 1" -else - echo "ok 1" -fi - -dd if=/dev/md${us0} of=${dst} count=$nblocks1 >/dev/null 2>&1 -if [ `md5 -q ${src}` = `md5 -q ${dst}` ]; then - echo "not ok 2" -else - echo "ok 2" -fi - -dd if=/dev/md${us1} of=${dst} count=$nblocks1 >/dev/null 2>&1 -if [ `md5 -q ${src}` = `md5 -q ${dst}` ]; then - echo "not ok 3" -else - echo "ok 3" -fi - -dd if=/dev/md${us2} of=${dst} count=$nblocks1 >/dev/null 2>&1 -if [ `md5 -q ${src}` = `md5 -q ${dst}` ]; then - echo "not ok 4" -else - echo "ok 4" -fi - -gshsec stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 -rm -f ${src} ${dst} diff --git a/tools/regression/geom_stripe/conf.sh b/tools/regression/geom_stripe/conf.sh deleted file mode 100644 index 22e5864..0000000 --- a/tools/regression/geom_stripe/conf.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -name="test" -class="stripe" -base=`basename $0` - -. `dirname $0`/../geom_subr.sh diff --git a/tools/regression/geom_stripe/test-1.t b/tools/regression/geom_stripe/test-1.t deleted file mode 100644 index 9b398f0..0000000 --- a/tools/regression/geom_stripe/test-1.t +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo "1..1" - -us=45 - -mdconfig -a -t malloc -s 1M -u $us || exit 1 -mdconfig -a -t malloc -s 2M -u `expr $us + 1` || exit 1 -mdconfig -a -t malloc -s 3M -u `expr $us + 2` || exit 1 - -gstripe create -s 16384 $name /dev/md${us} /dev/md`expr $us + 1` /dev/md`expr $us + 2` || exit 1 -devwait - -# Size of created device should be 1MB * 3. - -size=`diskinfo /dev/stripe/${name} | awk '{print $3}'` - -if [ $size -eq 3145728 ]; then - echo "ok 1" -else - echo "not ok 1" -fi - -gstripe destroy $name -mdconfig -d -u $us -mdconfig -d -u `expr $us + 1` -mdconfig -d -u `expr $us + 2` diff --git a/tools/regression/geom_stripe/test-2.t b/tools/regression/geom_stripe/test-2.t deleted file mode 100644 index 73937f4..0000000 --- a/tools/regression/geom_stripe/test-2.t +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo "1..1" - -us=45 -tsize=3 -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 - -dd if=/dev/random of=${src} bs=1m count=$tsize >/dev/null 2>&1 - -mdconfig -a -t malloc -s 1M -u $us || exit 1 -mdconfig -a -t malloc -s 2M -u `expr $us + 1` || exit 1 -mdconfig -a -t malloc -s 3M -u `expr $us + 2` || exit 1 - -gstripe create -s 8192 $name /dev/md${us} /dev/md`expr $us + 1` /dev/md`expr $us + 2` || exit 1 -devwait - -dd if=${src} of=/dev/stripe/${name} bs=1m count=$tsize >/dev/null 2>&1 -dd if=/dev/stripe/${name} of=${dst} bs=1m count=$tsize >/dev/null 2>&1 - -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 1" -else - echo "ok 1" -fi - -gstripe destroy $name -mdconfig -d -u $us -mdconfig -d -u `expr $us + 1` -mdconfig -d -u `expr $us + 2` -rm -f ${src} ${dst} diff --git a/tools/regression/geom_subr.sh b/tools/regression/geom_subr.sh deleted file mode 100644 index 6047829..0000000 --- a/tools/regression/geom_subr.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -kldstat -q -m g_${class} || g${class} load || exit 1 - -devwait() -{ - while :; do - if [ -c /dev/${class}/${name} ]; then - return - fi - sleep 0.2 - done -} diff --git a/tools/regression/geom_uzip/Makefile b/tools/regression/geom_uzip/Makefile deleted file mode 100644 index 6927ff1..0000000 --- a/tools/regression/geom_uzip/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# -# $FreeBSD$ -# -# Regression test for geom_ugz. -# - -IMAGE= test-1.img -ZIMAGE= ${IMAGE}.uzip -UZIMAGE= ${ZIMAGE}.uue - -test: - @sh runtests.sh - -image: - makefs -s 1048576 ${IMAGE} etalon - printf "#\n# $$" >${UZIMAGE} - printf "FreeBSD$$\n#\n\n" >> ${UZIMAGE} - mkuzip -o ${ZIMAGE} ${IMAGE} - uuencode ${ZIMAGE} ${ZIMAGE} >>${UZIMAGE} - rm ${ZIMAGE} - -clean: - rm -f ${IMAGE} ${ZIMAGE} diff --git a/tools/regression/geom_uzip/etalon/etalon.txt b/tools/regression/geom_uzip/etalon/etalon.txt deleted file mode 100644 index cb8acf3..0000000 --- a/tools/regression/geom_uzip/etalon/etalon.txt +++ /dev/null @@ -1,43 +0,0 @@ -# -# $FreeBSD$ -# - -JABBERWOCKY - -Lewis Carroll -(from Through the Looking-Glass and What Alice Found There, 1872) - -`Twas brillig, and the slithy toves -Did gyre and gimble in the wabe: -All mimsy were the borogoves, -And the mome raths outgrabe. - -"Beware the Jabberwock, my son! -The jaws that bite, the claws that catch! -Beware the Jubjub bird, and shun -The frumious Bandersnatch!" - -He took his vorpal sword in hand: -Long time the manxome foe he sought -- -So rested he by the Tumtum tree, -And stood awhile in thought. - -And, as in uffish thought he stood, -The Jabberwock, with eyes of flame, -Came whiffling through the tulgey wood, -And burbled as it came! - -One, two! One, two! And through and through -The vorpal blade went snicker-snack! -He left it dead, and with its head -He went galumphing back. - -"And, has thou slain the Jabberwock? -Come to my arms, my beamish boy! -O frabjous day! Callooh! Callay!' -He chortled in his joy. - -`Twas brillig, and the slithy toves -Did gyre and gimble in the wabe; -All mimsy were the borogoves, -And the mome raths outgrabe. diff --git a/tools/regression/geom_uzip/runtests.sh b/tools/regression/geom_uzip/runtests.sh deleted file mode 100644 index 60e78b5..0000000 --- a/tools/regression/geom_uzip/runtests.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -dir=`dirname $0` - -for ts in `dirname $0`/test-*.sh; do - sh $ts -done diff --git a/tools/regression/geom_uzip/test-1.img.uzip.uue b/tools/regression/geom_uzip/test-1.img.uzip.uue deleted file mode 100644 index ca16f47..0000000 --- a/tools/regression/geom_uzip/test-1.img.uzip.uue +++ /dev/null @@ -1,110 +0,0 @@ -# -# $FreeBSD$ -# - -begin 755 test-1.img.uzip -M(R$O8FEN+W-H"B-6,BXP($9O&ET("0_"@```````$`````` -M0`````````*0`````````W<````````$F@````````AQ````````")@````` -M```(OP````````CF````````"0T````````)-`````````E;````````"8(` -M```````)J0````````G0````````"?<````````*'@````````I%```````` -M"FP````````*DP````````JZ````````"N$````````+"`````````LO```` -M````"U8````````+?0````````ND````````"\L````````+\@````````P9 -M````````#$`````````,9P````````R.````````#+4````````,W``````` -M``T#````````#2H````````-40````````UX````````#9\````````-Q@`` -M``````WM````````#A0````````..P````````YB````````#HD````````. -ML`````````[7````````#OX````````/)0````````],````````#W,````` -M```/F@````````_!````````#^@````````0#P```````!`V````````$%T` -M```````0A````````!"K````````$-(````````0^0```````!$@```````` -M$4<````````1;@```````!&5````````$<%XVNW4/0K",!3`\1>M$`3!42<[ -M>@1!AX)X`^_@X`VZZ.[%''1V]0+>0(@O[0OMZF`5^?_@-6GS2=L\$0`````` -M````````\"_&&A.-7&-NSX)Z7)=KR41N?1$GUD'OO18#Z[>*EWL(\@QAI-6A -MU.WQHL/J<;ZUF-8++7JM>V?5N-YN<]I7>\@LTGCK%Z.P]CA'J;%(*;/SW_H;W97M*9*ZU>^8]YR7'QWX>"< -MUTV$F>7(?M,OY:9D.W6<"0```````````'3J!63?'NAXVNW9,4I#01#&\6^3 -M"*L@6&IE2@]@$=#B@7@#!6^@X`W2F-Z+6(BEM:6%UK9>P!L(ZTS>K"^"B"&8 -M6/Q_,&]W\W8W0\A.LU)KRV+;8FBQ%Y\5\_9\<*2!]-*7DF*"C;,U:S'OT!^O -MI>B]E$WK;JA][P];UJ[+ZEB_L:8W,T[1]>\[/[Z^G.8PB*CK8YY'$^]]C['% -MJ.Z5-!&P"H\YZREW__3A/\HM_FU=I4G>PDS@0```````````"6[K2W_GFOE_R&[;M[ -M=?W^CN_&XM;BSN+>XB))^Q9G%I.%,BU?1ROS0?MFN%A8EF:;+BI(]H"1M04NE -M2FW%BA-X,IX9MYYQ9'LZS=[V`1`OP0-PV$=`W+ARX@&X\`A(_.Q)2:A8@50J -M0??WD:9V//[Y:W]_GLETVE;KU>:WX5I366V*7W]\//;E#]^\/5PN'UQ39SY\ -MZY>UYECHK_ZE_HNY[F79N2'];Y^OA+)<;S[_--?_[HK^^]?47W^)_HNY_CNM -M/^L??MWH7I;=&UK_I?[]O]'OW;!^]XK^U?Q'-Z1/$`1!$`1!$`1!$`1!$`1! -M$`1!$,3MP?]=\!D>.V0%0;R2U_\;K?65WJ*^VL,/:TU];?SY/1P\&@;TE,M8.]B"O?8)F-/AJ/1 -MWM'3P_%G7S!V(&II8@.&\['+'0AP'"7 -M6]"5RPR&]AB[.Q(UGP<]X7$L3*TG9QTH9F!UV68X73CEM<4.N)!8.IR[[SM1 -M?S1.N)OD;;8\4!6?5C'V-DFS)IM791@J-54A=65AA,W"V#+$WF7L4XQ$\R!' -M?\^UF7(%MM8F\2O-L>^`'>@R`R>+1J+@Y85?4(JY\H;Y%#CH=MFQ!DR_$XEO -MCF>A\TE5N*H`AYNE\<.B5@*\SN6EER$>_<"S.&7K&ZLTE3:_/!=4?%@G+&39 -MJQJ3!6(FT-@44L4+5!GC3\#QTU1)/^^E3>(JE0G,51C+SR:N#.8T";+>SD*T -M&3LLO=.U;L.BUJ2R&8DOZF%"<]-BQ1,4%J4#6\K)F3!=-'ERUO8.*Y$Z+Y$( -M/D],F+IT%E?'$]\E1&9<5<4T]Q./,=9OD^!+SFVP`_]?N5`>7^="H?LM0?R76'O)\_]K6'^SM;%^I'5XVG\=C[=:&^Q(3+65 -M3IM9JW4'V[Y?V;BS5SHCA24S">)_QD!_\=.-@"!N)4LO\Z)^KQ_M&PG#*H/E5WGA]5[$=NDV0!"WB]\!34_J -M#GC:[<$Q`0```,*@]4]M#!^@````````````````````@+%$%=P/6@`"! -M```````````````````````````````````````````````````````````` -2```````````````````````` -` -end diff --git a/tools/regression/geom_uzip/test-1.sh b/tools/regression/geom_uzip/test-1.sh deleted file mode 100644 index 7e8f168..0000000 --- a/tools/regression/geom_uzip/test-1.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -mntpoint="/mnt/test-1" - -# -# prepare -kldload geom_uzip -uudecode test-1.img.uzip.uue -num=`mdconfig -an -f test-1.img.uzip` || exit 1 -sleep 1 - -# -# mount -mkdir -p "${mntpoint}" -mount -o ro /dev/md${num}.uzip "${mntpoint}" || exit 1 - -# -# compare -#cat "${mntpoint}/etalon.txt" -diff -u etalon/etalon.txt "${mntpoint}/etalon.txt" -if [ $? -eq 0 ]; then - echo "PASS" -else - echo "FAIL" -fi - -# -# cleanup -umount "${mntpoint}" -rmdir "${mntpoint}" -mdconfig -d -u ${num} -sleep 1 -kldunload geom_uzip diff --git a/tools/regression/geom_uzip/test-2.sh b/tools/regression/geom_uzip/test-2.sh deleted file mode 100644 index 8662827..0000000 --- a/tools/regression/geom_uzip/test-2.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# -# prepare -kldload geom_uzip -uudecode test-1.img.uzip.uue -num=`mdconfig -an -f test-1.img.uzip` || exit 1 -sleep 1 - -# -# destroy -kldunload geom_uzip -- cgit v1.1 From 0d0395b6fdd049d6a6eb596d44a66fe1b22e1b06 Mon Sep 17 00:00:00 2001 From: ngie Date: Thu, 26 Nov 2015 06:56:15 +0000 Subject: Skip over lines that start with comments --- tools/regression/lib/libc/resolv/resolv.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tools/regression') diff --git a/tools/regression/lib/libc/resolv/resolv.c b/tools/regression/lib/libc/resolv/resolv.c index d481ecf..9392872 100644 --- a/tools/regression/lib/libc/resolv/resolv.c +++ b/tools/regression/lib/libc/resolv/resolv.c @@ -87,6 +87,8 @@ load(const char *fname) if ((fp = fopen(fname, "r")) == NULL) err(1, "Cannot open `%s'", fname); while ((line = fgetln(fp, &len)) != NULL) { + if (line[0] == '#') + continue; char c = line[len]; char *ptr; line[len] = '\0'; -- cgit v1.1 From 59c723022b468ba836263eb2a5712cea28a70e53 Mon Sep 17 00:00:00 2001 From: ngie Date: Thu, 26 Nov 2015 06:57:10 +0000 Subject: - Remove cnftp.bjpu.edu.cn (it no longer resolves) - Add localhost to resolv/mach for parity with nss/mach --- tools/regression/lib/libc/nss/mach | 1 - tools/regression/lib/libc/resolv/mach | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/regression') diff --git a/tools/regression/lib/libc/nss/mach b/tools/regression/lib/libc/nss/mach index d25d8d6..ab7ce24 100644 --- a/tools/regression/lib/libc/nss/mach +++ b/tools/regression/lib/libc/nss/mach @@ -11,7 +11,6 @@ antioche.antioche.eu.org boulder.tele.dk centaurus.4web.cz chur.math.ntnu.no -cnftp.bjpu.edu.cn console.netbsd.org cvs.fi.netbsd.org cvs.mikrolahti.fi diff --git a/tools/regression/lib/libc/resolv/mach b/tools/regression/lib/libc/resolv/mach index f3c3981..ab7ce24 100644 --- a/tools/regression/lib/libc/resolv/mach +++ b/tools/regression/lib/libc/resolv/mach @@ -1,3 +1,5 @@ +# $FreeBSD$ +localhost above.warped.net anoncvs.cirr.com anoncvs.isc.netbsd.org @@ -9,7 +11,6 @@ antioche.antioche.eu.org boulder.tele.dk centaurus.4web.cz chur.math.ntnu.no -cnftp.bjpu.edu.cn console.netbsd.org cvs.fi.netbsd.org cvs.mikrolahti.fi -- cgit v1.1 From 13fcf1f8c2ed94cbabd6a4bee12f8ffb806252c5 Mon Sep 17 00:00:00 2001 From: ngie Date: Thu, 26 Nov 2015 07:55:20 +0000 Subject: r291359 was incorrect. Skip over tokens that start with `#' as fgetln can return more than one '\n' delimited line in a buffer Handle empty lines too, just in case MFC after: 3 days X-MFC with: r291359 --- tools/regression/lib/libc/resolv/resolv.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'tools/regression') diff --git a/tools/regression/lib/libc/resolv/resolv.c b/tools/regression/lib/libc/resolv/resolv.c index 9392872..2ec3eeb 100644 --- a/tools/regression/lib/libc/resolv/resolv.c +++ b/tools/regression/lib/libc/resolv/resolv.c @@ -87,13 +87,14 @@ load(const char *fname) if ((fp = fopen(fname, "r")) == NULL) err(1, "Cannot open `%s'", fname); while ((line = fgetln(fp, &len)) != NULL) { - if (line[0] == '#') - continue; char c = line[len]; char *ptr; line[len] = '\0'; - for (ptr = strtok(line, WS); ptr; ptr = strtok(NULL, WS)) + for (ptr = strtok(line, WS); ptr; ptr = strtok(NULL, WS)) { + if (ptr == '\0' || ptr[0] == '#') + continue; sl_add(hosts, strdup(ptr)); + } line[len] = c; } -- cgit v1.1