summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>2002-12-16 21:39:16 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>2002-12-16 21:39:16 +0000
commita99aa4c4834e5f48a12096eb21593eb8bbba22ea (patch)
tree8b574fec73f8713952bc131e0e7c4e09aebbe312 /tools
parent660887c9f9b3baa3be598f7316e1c16c5cdf80d6 (diff)
Notes
Diffstat (limited to 'tools')
-rw-r--r--tools/regression/geom/ConfCmp/ConfCmp.c7
-rw-r--r--tools/regression/geom/GLib/Makefile2
-rw-r--r--tools/regression/geom/Test/Makefile2
-rw-r--r--tools/regression/geom/Test/T001/ref.conf12
-rw-r--r--tools/regression/geom/Test/T004/ref.conf4
-rw-r--r--tools/regression/geom/Test/T005/ref.conf4
-rw-r--r--tools/regression/geom/Test/T013/ref.conf12
-rw-r--r--tools/regression/geom/geom_sim.h1
8 files changed, 34 insertions, 10 deletions
diff --git a/tools/regression/geom/ConfCmp/ConfCmp.c b/tools/regression/geom/ConfCmp/ConfCmp.c
index 858b9e9dc6c8..69a3c58ef1bf 100644
--- a/tools/regression/geom/ConfCmp/ConfCmp.c
+++ b/tools/regression/geom/ConfCmp/ConfCmp.c
@@ -48,6 +48,8 @@
#include <err.h>
#include <bsdxml.h>
+FILE *fsubs;
+
struct node {
LIST_HEAD(, node) children;
LIST_ENTRY(node) siblings;
@@ -266,6 +268,10 @@ refcmp(char *r1, char *r2)
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);
}
@@ -351,6 +357,7 @@ main(int argc, char **argv)
struct mytree *t1, *t2;
int i;
+ fsubs = fopen("_.subs", "w");
setbuf(stdout, NULL);
setbuf(stderr, NULL);
if (argc != 3)
diff --git a/tools/regression/geom/GLib/Makefile b/tools/regression/geom/GLib/Makefile
index 93b9812006ee..01d9836633b3 100644
--- a/tools/regression/geom/GLib/Makefile
+++ b/tools/regression/geom/GLib/Makefile
@@ -16,7 +16,7 @@ CFLAGS += -DKERNELSIM
NOPIC = static
NOPROFILE = bingo
NOOBJ = youbet
-WARNS = 2
+WARNS = 0
.PATH: /sys/geom .. /sys/kern
diff --git a/tools/regression/geom/Test/Makefile b/tools/regression/geom/Test/Makefile
index 602334fadee0..ebceb87b207b 100644
--- a/tools/regression/geom/Test/Makefile
+++ b/tools/regression/geom/Test/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
SUBDIR+= T000 T001 T002 T003 T004 T005 T006 T007 T008 T009
-SUBDIR+= T010 T011 T012 T013 T014
+SUBDIR+= T011 T012 T013 T014
# SUBDIR+= T999
diff --git a/tools/regression/geom/Test/T001/ref.conf b/tools/regression/geom/Test/T001/ref.conf
index e8f52b89ba51..e41d2e581e0f 100644
--- a/tools/regression/geom/Test/T001/ref.conf
+++ b/tools/regression/geom/Test/T001/ref.conf
@@ -206,8 +206,10 @@
<name>ad0s3</name>
<rank>3</rank>
<config>
- <labeloffset>512</labeloffset>
<frontstuff>8192</frontstuff>
+ <labeloffset>512</labeloffset>
+ <rawoffset>16768080</rawoffset>
+ <mbroffset>8585256960</mbroffset>
</config>
<consumer id="0x80b9b80">
<geom ref="0x80b8f80"/>
@@ -264,8 +266,10 @@
<name>ad0s2</name>
<rank>3</rank>
<config>
- <labeloffset>512</labeloffset>
<frontstuff>8192</frontstuff>
+ <labeloffset>512</labeloffset>
+ <rawoffset>6289920</rawoffset>
+ <mbroffset>3220439040</mbroffset>
</config>
<consumer id="0x80b9a40">
<geom ref="0x80b8c80"/>
@@ -294,8 +298,10 @@
<name>ad0s1</name>
<rank>3</rank>
<config>
- <labeloffset>512</labeloffset>
<frontstuff>8192</frontstuff>
+ <labeloffset>512</labeloffset>
+ <rawoffset>63</rawoffset>
+ <mbroffset>32256</mbroffset>
</config>
<consumer id="0x80b9800">
<geom ref="0x80b8700"/>
diff --git a/tools/regression/geom/Test/T004/ref.conf b/tools/regression/geom/Test/T004/ref.conf
index 3548da007715..73aa1a274387 100644
--- a/tools/regression/geom/Test/T004/ref.conf
+++ b/tools/regression/geom/Test/T004/ref.conf
@@ -146,8 +146,10 @@
<name>ad0s1</name>
<rank>3</rank>
<config>
- <labeloffset>512</labeloffset>
<frontstuff>8192</frontstuff>
+ <labeloffset>512</labeloffset>
+ <rawoffset>63</rawoffset>
+ <mbroffset>32256</mbroffset>
</config>
<consumer id="0x80b9780">
<geom ref="0x80b8600"/>
diff --git a/tools/regression/geom/Test/T005/ref.conf b/tools/regression/geom/Test/T005/ref.conf
index 60e2af9fe373..50644ce53a39 100644
--- a/tools/regression/geom/Test/T005/ref.conf
+++ b/tools/regression/geom/Test/T005/ref.conf
@@ -56,8 +56,10 @@
<name>ad0</name>
<rank>2</rank>
<config>
- <labeloffset>512</labeloffset>
<frontstuff>8192</frontstuff>
+ <labeloffset>512</labeloffset>
+ <rawoffset>0</rawoffset>
+ <mbroffset>0</mbroffset>
</config>
<consumer id="0x80b9640">
<geom ref="0x80b8300"/>
diff --git a/tools/regression/geom/Test/T013/ref.conf b/tools/regression/geom/Test/T013/ref.conf
index 1098f4c6528f..8b3c93c790db 100644
--- a/tools/regression/geom/Test/T013/ref.conf
+++ b/tools/regression/geom/Test/T013/ref.conf
@@ -156,8 +156,10 @@
<name>da2</name>
<rank>2</rank>
<config>
- <labeloffset>64</labeloffset>
<frontstuff>8192</frontstuff>
+ <labeloffset>64</labeloffset>
+ <rawoffset>0</rawoffset>
+ <mbroffset>0</mbroffset>
</config>
<consumer id="0x80b9ac0">
<geom ref="0x80b8d80"/>
@@ -214,8 +216,10 @@
<name>da1</name>
<rank>2</rank>
<config>
- <labeloffset>64</labeloffset>
<frontstuff>8192</frontstuff>
+ <labeloffset>64</labeloffset>
+ <rawoffset>0</rawoffset>
+ <mbroffset>0</mbroffset>
</config>
<consumer id="0x80b98c0">
<geom ref="0x80b8900"/>
@@ -300,8 +304,10 @@
<name>da0</name>
<rank>2</rank>
<config>
- <labeloffset>64</labeloffset>
<frontstuff>8192</frontstuff>
+ <labeloffset>64</labeloffset>
+ <rawoffset>0</rawoffset>
+ <mbroffset>0</mbroffset>
</config>
<consumer id="0x80b9740">
<geom ref="0x80b8500"/>
diff --git a/tools/regression/geom/geom_sim.h b/tools/regression/geom/geom_sim.h
index d3c48ac88fc3..1c98a99a207a 100644
--- a/tools/regression/geom/geom_sim.h
+++ b/tools/regression/geom/geom_sim.h
@@ -165,3 +165,4 @@ void sdumpf(char *file);
#define THR_DOWN 2
#define THR_EVENT 3
+#define EJUSTRETURN (-2)
generated by cgit v1.3 (git 2.53.0) at 2026-07-30 10:30:19 +0000