diff --git a/tools/regression/usr.bin/sed/multitest.t b/tools/regression/usr.bin/sed/multitest.t index f3a42e26d86a..53c14c56feb9 100644 --- a/tools/regression/usr.bin/sed/multitest.t +++ b/tools/regression/usr.bin/sed/multitest.t @@ -37,11 +37,9 @@ # # The directory regress.test.out contains the expected test results # -# These are the regression tests created during the development of the -# BSD sed. The reference file naming scheme used in this script can't -# handle gracefully the insertion of new tests between existing ones. -# Therefore, either use the new m4-based regress.t framework, or add -# tests after the last existing test. +# These are the regression tests mostly created during the development +# of the BSD sed. Each test should have a unique mark name, which is +# used for naming the corresponding file in regress.multitest.out. main() { @@ -88,11 +86,11 @@ result() else TODO='' fi - if ! [ -r $REGRESS/${MARK}_${TESTNAME} ] ; then - echo "Seeding $REGRESS/${MARK}_${TESTNAME} with current result" 1>&2 - cp current.out $REGRESS/${MARK}_${TESTNAME} + if ! [ -r $REGRESS/${TESTNAME} ] ; then + echo "Seeding $REGRESS/${TESTNAME} with current result" 1>&2 + cp current.out $REGRESS/${TESTNAME} fi - if diff -c $REGRESS/${MARK}_${TESTNAME} current.out ; then + if diff -c $REGRESS/${TESTNAME} current.out ; then echo "ok $MARK $TESTNAME # $TODO$COMMENT" else echo "not ok $MARK $TESTNAME # $TODO$COMMENT" diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/1_1.1 b/tools/regression/usr.bin/sed/regress.multitest.out/1.1 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/1_1.1 rename to tools/regression/usr.bin/sed/regress.multitest.out/1.1 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/10_1.9 b/tools/regression/usr.bin/sed/regress.multitest.out/1.10 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/10_1.9 rename to tools/regression/usr.bin/sed/regress.multitest.out/1.10 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/12_1.11 b/tools/regression/usr.bin/sed/regress.multitest.out/1.11 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/12_1.11 rename to tools/regression/usr.bin/sed/regress.multitest.out/1.11 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/13_1.12 b/tools/regression/usr.bin/sed/regress.multitest.out/1.12 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/13_1.12 rename to tools/regression/usr.bin/sed/regress.multitest.out/1.12 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/14_1.13 b/tools/regression/usr.bin/sed/regress.multitest.out/1.13 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/14_1.13 rename to tools/regression/usr.bin/sed/regress.multitest.out/1.13 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/15_1.14 b/tools/regression/usr.bin/sed/regress.multitest.out/1.14 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/15_1.14 rename to tools/regression/usr.bin/sed/regress.multitest.out/1.14 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/16_1.15 b/tools/regression/usr.bin/sed/regress.multitest.out/1.15 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/16_1.15 rename to tools/regression/usr.bin/sed/regress.multitest.out/1.15 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/17_1.16 b/tools/regression/usr.bin/sed/regress.multitest.out/1.16 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/17_1.16 rename to tools/regression/usr.bin/sed/regress.multitest.out/1.16 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/18_1.17 b/tools/regression/usr.bin/sed/regress.multitest.out/1.17 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/18_1.17 rename to tools/regression/usr.bin/sed/regress.multitest.out/1.17 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/19_1.18 b/tools/regression/usr.bin/sed/regress.multitest.out/1.18 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/19_1.18 rename to tools/regression/usr.bin/sed/regress.multitest.out/1.18 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/2_1.2 b/tools/regression/usr.bin/sed/regress.multitest.out/1.2 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/2_1.2 rename to tools/regression/usr.bin/sed/regress.multitest.out/1.2 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/3_1.3 b/tools/regression/usr.bin/sed/regress.multitest.out/1.3 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/3_1.3 rename to tools/regression/usr.bin/sed/regress.multitest.out/1.3 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/4_1.4 b/tools/regression/usr.bin/sed/regress.multitest.out/1.4 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/4_1.4 rename to tools/regression/usr.bin/sed/regress.multitest.out/1.4 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/5_1.4.1 b/tools/regression/usr.bin/sed/regress.multitest.out/1.4.1 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/5_1.4.1 rename to tools/regression/usr.bin/sed/regress.multitest.out/1.4.1 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/6_1.5 b/tools/regression/usr.bin/sed/regress.multitest.out/1.5 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/6_1.5 rename to tools/regression/usr.bin/sed/regress.multitest.out/1.5 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/7_1.6 b/tools/regression/usr.bin/sed/regress.multitest.out/1.6 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/7_1.6 rename to tools/regression/usr.bin/sed/regress.multitest.out/1.6 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/8_1.7 b/tools/regression/usr.bin/sed/regress.multitest.out/1.7 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/8_1.7 rename to tools/regression/usr.bin/sed/regress.multitest.out/1.7 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/9_1.8 b/tools/regression/usr.bin/sed/regress.multitest.out/1.8 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/9_1.8 rename to tools/regression/usr.bin/sed/regress.multitest.out/1.8 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/11_1.10 b/tools/regression/usr.bin/sed/regress.multitest.out/1.9 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/11_1.10 rename to tools/regression/usr.bin/sed/regress.multitest.out/1.9 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/20_2.1 b/tools/regression/usr.bin/sed/regress.multitest.out/2.1 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/20_2.1 rename to tools/regression/usr.bin/sed/regress.multitest.out/2.1 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/28_2.9 b/tools/regression/usr.bin/sed/regress.multitest.out/2.10 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/28_2.9 rename to tools/regression/usr.bin/sed/regress.multitest.out/2.10 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/29_2.10 b/tools/regression/usr.bin/sed/regress.multitest.out/2.11 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/29_2.10 rename to tools/regression/usr.bin/sed/regress.multitest.out/2.11 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/31_2.12 b/tools/regression/usr.bin/sed/regress.multitest.out/2.12 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/31_2.12 rename to tools/regression/usr.bin/sed/regress.multitest.out/2.12 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/32_2.13 b/tools/regression/usr.bin/sed/regress.multitest.out/2.13 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/32_2.13 rename to tools/regression/usr.bin/sed/regress.multitest.out/2.13 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/33_2.14 b/tools/regression/usr.bin/sed/regress.multitest.out/2.14 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/33_2.14 rename to tools/regression/usr.bin/sed/regress.multitest.out/2.14 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/34_2.15 b/tools/regression/usr.bin/sed/regress.multitest.out/2.15 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/34_2.15 rename to tools/regression/usr.bin/sed/regress.multitest.out/2.15 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/35_2.16 b/tools/regression/usr.bin/sed/regress.multitest.out/2.16 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/35_2.16 rename to tools/regression/usr.bin/sed/regress.multitest.out/2.16 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/36_2.17 b/tools/regression/usr.bin/sed/regress.multitest.out/2.17 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/36_2.17 rename to tools/regression/usr.bin/sed/regress.multitest.out/2.17 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/37_2.18 b/tools/regression/usr.bin/sed/regress.multitest.out/2.18 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/37_2.18 rename to tools/regression/usr.bin/sed/regress.multitest.out/2.18 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/38_2.19 b/tools/regression/usr.bin/sed/regress.multitest.out/2.19 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/38_2.19 rename to tools/regression/usr.bin/sed/regress.multitest.out/2.19 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/21_2.2 b/tools/regression/usr.bin/sed/regress.multitest.out/2.2 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/21_2.2 rename to tools/regression/usr.bin/sed/regress.multitest.out/2.2 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/30_2.11 b/tools/regression/usr.bin/sed/regress.multitest.out/2.20 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/30_2.11 rename to tools/regression/usr.bin/sed/regress.multitest.out/2.20 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/40_2.21 b/tools/regression/usr.bin/sed/regress.multitest.out/2.21 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/40_2.21 rename to tools/regression/usr.bin/sed/regress.multitest.out/2.21 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/41_2.22 b/tools/regression/usr.bin/sed/regress.multitest.out/2.22 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/41_2.22 rename to tools/regression/usr.bin/sed/regress.multitest.out/2.22 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/22_2.3 b/tools/regression/usr.bin/sed/regress.multitest.out/2.3 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/22_2.3 rename to tools/regression/usr.bin/sed/regress.multitest.out/2.3 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/23_2.4 b/tools/regression/usr.bin/sed/regress.multitest.out/2.4 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/23_2.4 rename to tools/regression/usr.bin/sed/regress.multitest.out/2.4 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/24_2.5 b/tools/regression/usr.bin/sed/regress.multitest.out/2.5 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/24_2.5 rename to tools/regression/usr.bin/sed/regress.multitest.out/2.5 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/25_2.6 b/tools/regression/usr.bin/sed/regress.multitest.out/2.6 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/25_2.6 rename to tools/regression/usr.bin/sed/regress.multitest.out/2.6 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/26_2.7 b/tools/regression/usr.bin/sed/regress.multitest.out/2.7 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/26_2.7 rename to tools/regression/usr.bin/sed/regress.multitest.out/2.7 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/27_2.8 b/tools/regression/usr.bin/sed/regress.multitest.out/2.8 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/27_2.8 rename to tools/regression/usr.bin/sed/regress.multitest.out/2.8 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/39_2.20 b/tools/regression/usr.bin/sed/regress.multitest.out/2.9 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/39_2.20 rename to tools/regression/usr.bin/sed/regress.multitest.out/2.9 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/40_3.1 b/tools/regression/usr.bin/sed/regress.multitest.out/3.1 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/40_3.1 rename to tools/regression/usr.bin/sed/regress.multitest.out/3.1 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/41_3.2 b/tools/regression/usr.bin/sed/regress.multitest.out/3.2 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/41_3.2 rename to tools/regression/usr.bin/sed/regress.multitest.out/3.2 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/42_3.3 b/tools/regression/usr.bin/sed/regress.multitest.out/3.3 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/42_3.3 rename to tools/regression/usr.bin/sed/regress.multitest.out/3.3 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/43_3.4 b/tools/regression/usr.bin/sed/regress.multitest.out/3.4 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/43_3.4 rename to tools/regression/usr.bin/sed/regress.multitest.out/3.4 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/44_4.1 b/tools/regression/usr.bin/sed/regress.multitest.out/4.1 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/44_4.1 rename to tools/regression/usr.bin/sed/regress.multitest.out/4.1 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/45_4.2 b/tools/regression/usr.bin/sed/regress.multitest.out/4.2 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/45_4.2 rename to tools/regression/usr.bin/sed/regress.multitest.out/4.2 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/46_4.3 b/tools/regression/usr.bin/sed/regress.multitest.out/4.3 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/46_4.3 rename to tools/regression/usr.bin/sed/regress.multitest.out/4.3 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/47_4.4 b/tools/regression/usr.bin/sed/regress.multitest.out/4.4 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/47_4.4 rename to tools/regression/usr.bin/sed/regress.multitest.out/4.4 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/48_4.5 b/tools/regression/usr.bin/sed/regress.multitest.out/4.5 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/48_4.5 rename to tools/regression/usr.bin/sed/regress.multitest.out/4.5 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/49_4.6 b/tools/regression/usr.bin/sed/regress.multitest.out/4.6 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/49_4.6 rename to tools/regression/usr.bin/sed/regress.multitest.out/4.6 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/50_4.7 b/tools/regression/usr.bin/sed/regress.multitest.out/4.7 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/50_4.7 rename to tools/regression/usr.bin/sed/regress.multitest.out/4.7 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/51_4.8 b/tools/regression/usr.bin/sed/regress.multitest.out/4.8 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/51_4.8 rename to tools/regression/usr.bin/sed/regress.multitest.out/4.8 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/52_5.1 b/tools/regression/usr.bin/sed/regress.multitest.out/5.1 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/52_5.1 rename to tools/regression/usr.bin/sed/regress.multitest.out/5.1 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/53_5.2 b/tools/regression/usr.bin/sed/regress.multitest.out/5.2 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/53_5.2 rename to tools/regression/usr.bin/sed/regress.multitest.out/5.2 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/54_5.3 b/tools/regression/usr.bin/sed/regress.multitest.out/5.3 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/54_5.3 rename to tools/regression/usr.bin/sed/regress.multitest.out/5.3 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/55_5.4 b/tools/regression/usr.bin/sed/regress.multitest.out/5.4 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/55_5.4 rename to tools/regression/usr.bin/sed/regress.multitest.out/5.4 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/56_5.5 b/tools/regression/usr.bin/sed/regress.multitest.out/5.5 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/56_5.5 rename to tools/regression/usr.bin/sed/regress.multitest.out/5.5 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/57_5.6 b/tools/regression/usr.bin/sed/regress.multitest.out/5.6 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/57_5.6 rename to tools/regression/usr.bin/sed/regress.multitest.out/5.6 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/58_5.7 b/tools/regression/usr.bin/sed/regress.multitest.out/5.7 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/58_5.7 rename to tools/regression/usr.bin/sed/regress.multitest.out/5.7 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/59_5.8 b/tools/regression/usr.bin/sed/regress.multitest.out/5.8 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/59_5.8 rename to tools/regression/usr.bin/sed/regress.multitest.out/5.8 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/60_6.1 b/tools/regression/usr.bin/sed/regress.multitest.out/6.1 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/60_6.1 rename to tools/regression/usr.bin/sed/regress.multitest.out/6.1 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/61_6.2 b/tools/regression/usr.bin/sed/regress.multitest.out/6.2 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/61_6.2 rename to tools/regression/usr.bin/sed/regress.multitest.out/6.2 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/62_6.3 b/tools/regression/usr.bin/sed/regress.multitest.out/6.3 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/62_6.3 rename to tools/regression/usr.bin/sed/regress.multitest.out/6.3 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/63_6.4 b/tools/regression/usr.bin/sed/regress.multitest.out/6.4 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/63_6.4 rename to tools/regression/usr.bin/sed/regress.multitest.out/6.4 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/64_6.5 b/tools/regression/usr.bin/sed/regress.multitest.out/6.5 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/64_6.5 rename to tools/regression/usr.bin/sed/regress.multitest.out/6.5 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/65_6.6 b/tools/regression/usr.bin/sed/regress.multitest.out/6.6 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/65_6.6 rename to tools/regression/usr.bin/sed/regress.multitest.out/6.6 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/66_7.1 b/tools/regression/usr.bin/sed/regress.multitest.out/7.1 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/66_7.1 rename to tools/regression/usr.bin/sed/regress.multitest.out/7.1 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/67_7.2 b/tools/regression/usr.bin/sed/regress.multitest.out/7.2 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/67_7.2 rename to tools/regression/usr.bin/sed/regress.multitest.out/7.2 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/68_7.3 b/tools/regression/usr.bin/sed/regress.multitest.out/7.3 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/68_7.3 rename to tools/regression/usr.bin/sed/regress.multitest.out/7.3 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/69_7.4 b/tools/regression/usr.bin/sed/regress.multitest.out/7.4 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/69_7.4 rename to tools/regression/usr.bin/sed/regress.multitest.out/7.4 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/70_7.5 b/tools/regression/usr.bin/sed/regress.multitest.out/7.5 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/70_7.5 rename to tools/regression/usr.bin/sed/regress.multitest.out/7.5 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/71_7.6 b/tools/regression/usr.bin/sed/regress.multitest.out/7.6 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/71_7.6 rename to tools/regression/usr.bin/sed/regress.multitest.out/7.6 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/72_7.7 b/tools/regression/usr.bin/sed/regress.multitest.out/7.7 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/72_7.7 rename to tools/regression/usr.bin/sed/regress.multitest.out/7.7 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/73_7.8 b/tools/regression/usr.bin/sed/regress.multitest.out/7.8 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/73_7.8 rename to tools/regression/usr.bin/sed/regress.multitest.out/7.8 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/74_8.1 b/tools/regression/usr.bin/sed/regress.multitest.out/8.1 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/74_8.1 rename to tools/regression/usr.bin/sed/regress.multitest.out/8.1 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/83_8.10 b/tools/regression/usr.bin/sed/regress.multitest.out/8.10 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/83_8.10 rename to tools/regression/usr.bin/sed/regress.multitest.out/8.10 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/84_8.11 b/tools/regression/usr.bin/sed/regress.multitest.out/8.11 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/84_8.11 rename to tools/regression/usr.bin/sed/regress.multitest.out/8.11 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/85_8.12 b/tools/regression/usr.bin/sed/regress.multitest.out/8.12 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/85_8.12 rename to tools/regression/usr.bin/sed/regress.multitest.out/8.12 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/86_8.13 b/tools/regression/usr.bin/sed/regress.multitest.out/8.13 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/86_8.13 rename to tools/regression/usr.bin/sed/regress.multitest.out/8.13 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/87_8.14 b/tools/regression/usr.bin/sed/regress.multitest.out/8.14 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/87_8.14 rename to tools/regression/usr.bin/sed/regress.multitest.out/8.14 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/88_8.15 b/tools/regression/usr.bin/sed/regress.multitest.out/8.15 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/88_8.15 rename to tools/regression/usr.bin/sed/regress.multitest.out/8.15 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/89_8.16 b/tools/regression/usr.bin/sed/regress.multitest.out/8.16 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/89_8.16 rename to tools/regression/usr.bin/sed/regress.multitest.out/8.16 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/77_8.4 b/tools/regression/usr.bin/sed/regress.multitest.out/8.17 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/77_8.4 rename to tools/regression/usr.bin/sed/regress.multitest.out/8.17 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/75_8.2 b/tools/regression/usr.bin/sed/regress.multitest.out/8.2 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/75_8.2 rename to tools/regression/usr.bin/sed/regress.multitest.out/8.2 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/76_8.3 b/tools/regression/usr.bin/sed/regress.multitest.out/8.3 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/76_8.3 rename to tools/regression/usr.bin/sed/regress.multitest.out/8.3 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/90_8.17 b/tools/regression/usr.bin/sed/regress.multitest.out/8.4 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/90_8.17 rename to tools/regression/usr.bin/sed/regress.multitest.out/8.4 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/78_8.5 b/tools/regression/usr.bin/sed/regress.multitest.out/8.5 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/78_8.5 rename to tools/regression/usr.bin/sed/regress.multitest.out/8.5 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/79_8.6 b/tools/regression/usr.bin/sed/regress.multitest.out/8.6 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/79_8.6 rename to tools/regression/usr.bin/sed/regress.multitest.out/8.6 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/80_8.7 b/tools/regression/usr.bin/sed/regress.multitest.out/8.7 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/80_8.7 rename to tools/regression/usr.bin/sed/regress.multitest.out/8.7 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/81_8.8 b/tools/regression/usr.bin/sed/regress.multitest.out/8.8 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/81_8.8 rename to tools/regression/usr.bin/sed/regress.multitest.out/8.8 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/82_8.9 b/tools/regression/usr.bin/sed/regress.multitest.out/8.9 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/82_8.9 rename to tools/regression/usr.bin/sed/regress.multitest.out/8.9 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/100_9.10 b/tools/regression/usr.bin/sed/regress.multitest.out/9.1 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/100_9.10 rename to tools/regression/usr.bin/sed/regress.multitest.out/9.1 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/101_9.11 b/tools/regression/usr.bin/sed/regress.multitest.out/9.10 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/101_9.11 rename to tools/regression/usr.bin/sed/regress.multitest.out/9.10 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/102_9.12 b/tools/regression/usr.bin/sed/regress.multitest.out/9.11 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/102_9.12 rename to tools/regression/usr.bin/sed/regress.multitest.out/9.11 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/103_9.13 b/tools/regression/usr.bin/sed/regress.multitest.out/9.12 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/103_9.13 rename to tools/regression/usr.bin/sed/regress.multitest.out/9.12 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/104_9.14 b/tools/regression/usr.bin/sed/regress.multitest.out/9.13 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/104_9.14 rename to tools/regression/usr.bin/sed/regress.multitest.out/9.13 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/105_9.15 b/tools/regression/usr.bin/sed/regress.multitest.out/9.14 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/105_9.15 rename to tools/regression/usr.bin/sed/regress.multitest.out/9.14 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/106_9.16 b/tools/regression/usr.bin/sed/regress.multitest.out/9.15 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/106_9.16 rename to tools/regression/usr.bin/sed/regress.multitest.out/9.15 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/107_9.17 b/tools/regression/usr.bin/sed/regress.multitest.out/9.16 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/107_9.17 rename to tools/regression/usr.bin/sed/regress.multitest.out/9.16 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/108_9.18 b/tools/regression/usr.bin/sed/regress.multitest.out/9.17 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/108_9.18 rename to tools/regression/usr.bin/sed/regress.multitest.out/9.17 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/109_9.19 b/tools/regression/usr.bin/sed/regress.multitest.out/9.18 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/109_9.19 rename to tools/regression/usr.bin/sed/regress.multitest.out/9.18 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/110_9.20 b/tools/regression/usr.bin/sed/regress.multitest.out/9.19 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/110_9.20 rename to tools/regression/usr.bin/sed/regress.multitest.out/9.19 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/111_9.21 b/tools/regression/usr.bin/sed/regress.multitest.out/9.2 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/111_9.21 rename to tools/regression/usr.bin/sed/regress.multitest.out/9.2 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/112_9.22 b/tools/regression/usr.bin/sed/regress.multitest.out/9.20 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/112_9.22 rename to tools/regression/usr.bin/sed/regress.multitest.out/9.20 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/113_9.23 b/tools/regression/usr.bin/sed/regress.multitest.out/9.21 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/113_9.23 rename to tools/regression/usr.bin/sed/regress.multitest.out/9.21 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/114_9.24 b/tools/regression/usr.bin/sed/regress.multitest.out/9.22 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/114_9.24 rename to tools/regression/usr.bin/sed/regress.multitest.out/9.22 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/115_9.25 b/tools/regression/usr.bin/sed/regress.multitest.out/9.23 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/115_9.25 rename to tools/regression/usr.bin/sed/regress.multitest.out/9.23 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/116_9.26 b/tools/regression/usr.bin/sed/regress.multitest.out/9.24 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/116_9.26 rename to tools/regression/usr.bin/sed/regress.multitest.out/9.24 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/117_9.27 b/tools/regression/usr.bin/sed/regress.multitest.out/9.25 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/117_9.27 rename to tools/regression/usr.bin/sed/regress.multitest.out/9.25 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/118_9.28 b/tools/regression/usr.bin/sed/regress.multitest.out/9.26 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/118_9.28 rename to tools/regression/usr.bin/sed/regress.multitest.out/9.26 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/119_9.29 b/tools/regression/usr.bin/sed/regress.multitest.out/9.27 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/119_9.29 rename to tools/regression/usr.bin/sed/regress.multitest.out/9.27 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/120_9.30 b/tools/regression/usr.bin/sed/regress.multitest.out/9.28 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/120_9.30 rename to tools/regression/usr.bin/sed/regress.multitest.out/9.28 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/91_9.1 b/tools/regression/usr.bin/sed/regress.multitest.out/9.29 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/91_9.1 rename to tools/regression/usr.bin/sed/regress.multitest.out/9.29 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/92_9.2 b/tools/regression/usr.bin/sed/regress.multitest.out/9.3 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/92_9.2 rename to tools/regression/usr.bin/sed/regress.multitest.out/9.3 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/93_9.3 b/tools/regression/usr.bin/sed/regress.multitest.out/9.30 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/93_9.3 rename to tools/regression/usr.bin/sed/regress.multitest.out/9.30 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/121_9.31 b/tools/regression/usr.bin/sed/regress.multitest.out/9.31 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/121_9.31 rename to tools/regression/usr.bin/sed/regress.multitest.out/9.31 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/94_9.4 b/tools/regression/usr.bin/sed/regress.multitest.out/9.4 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/94_9.4 rename to tools/regression/usr.bin/sed/regress.multitest.out/9.4 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/95_9.5 b/tools/regression/usr.bin/sed/regress.multitest.out/9.5 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/95_9.5 rename to tools/regression/usr.bin/sed/regress.multitest.out/9.5 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/96_9.6 b/tools/regression/usr.bin/sed/regress.multitest.out/9.6 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/96_9.6 rename to tools/regression/usr.bin/sed/regress.multitest.out/9.6 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/97_9.7 b/tools/regression/usr.bin/sed/regress.multitest.out/9.7 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/97_9.7 rename to tools/regression/usr.bin/sed/regress.multitest.out/9.7 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/98_9.8 b/tools/regression/usr.bin/sed/regress.multitest.out/9.8 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/98_9.8 rename to tools/regression/usr.bin/sed/regress.multitest.out/9.8 diff --git a/tools/regression/usr.bin/sed/regress.multitest.out/99_9.9 b/tools/regression/usr.bin/sed/regress.multitest.out/9.9 similarity index 100% rename from tools/regression/usr.bin/sed/regress.multitest.out/99_9.9 rename to tools/regression/usr.bin/sed/regress.multitest.out/9.9