Make table tests less sensitive to environmental conditions.

Work started with revision 1.4
ok dhartmei@

9 files changed, 72 insertions, 72 deletions

diff --git a/regress/sbin/pfctl/pfr.exec b/regress/sbin/pfctl/pfr.exec
index 9c37cd6230a..57efb9cfb2c 100644
--- a/regress/sbin/pfctl/pfr.exec
+++ b/regress/sbin/pfctl/pfr.exec
@@ -29,14 +29,14 @@ for LINE in `sed -e "s/ /_/g" $1`; do
 	if [ "$RESULT" = "pass" ]; then case $CMD in
 	add|delete|replace)
 		echo "# pass $CMD -n $ARGS"
-		pfctl -t regress -nT $CMD $ARGS 2>&1 || exit 1
+		pfctl -t regress -nT $CMD $ARGS 2>&1 | sort || exit 1
 		echo "# pass $CMD -nf-"
 		echo "# test\n" $ARGSX | pfctl -t regress -nT $CMD -f- \
-			2>&1 || exit 1
+			2>&1 | sort || exit 1
 		echo "# pass $CMD -nqv $ARGS"
-		pfctl -t regress -nqvT $CMD $ARGS 2>&1 || exit 1
+		pfctl -t regress -nqvT $CMD $ARGS 2>&1 | sort || exit 1
 		echo "# pass $CMD -nqvv $ARGS"
-		pfctl -t regress -nqvvT $CMD $ARGS 2>&1 || exit 1
+		pfctl -t regress -nqvvT $CMD $ARGS 2>&1 | sort || exit 1
 		;;
 	esac fi
 	echo "# $RESULT $CMD $ARGS"
diff --git a/regress/sbin/pfctl/pfr1.ok b/regress/sbin/pfctl/pfr1.ok
index 8f17d2bf0a1..40b6a1e11cb 100644
--- a/regress/sbin/pfctl/pfr1.ok
+++ b/regress/sbin/pfctl/pfr1.ok
@@ -22,9 +22,9 @@ A  1.1.1.3
 D  1.1.1.1
 D  1.1.1.2
 # pass delete -nqvv 1.1.1.1 1.1.1.2 1.1.1.4
+   1.1.1.4
 D  1.1.1.1
 D  1.1.1.2
-   1.1.1.4
 # pass delete 1.1.1.1 1.1.1.2 1.1.1.4
 2/3 addresses deleted.
 # pass replace -n 1.1.1.1 1.1.1.2 1.1.1.3
@@ -35,9 +35,9 @@ D  1.1.1.2
 A  1.1.1.1
 A  1.1.1.2
 # pass replace -nqvv 1.1.1.1 1.1.1.2 1.1.1.3
+   1.1.1.3
 A  1.1.1.1
 A  1.1.1.2
-   1.1.1.3
 # pass replace 1.1.1.1 1.1.1.2 1.1.1.3
 2 addresses added.
 # pass test 1.1.1.1 1.1.1.2 1.1.1.3
diff --git a/regress/sbin/pfctl/pfr2.ok b/regress/sbin/pfctl/pfr2.ok
index ed9dc5c61d6..f6ebce60503 100644
--- a/regress/sbin/pfctl/pfr2.ok
+++ b/regress/sbin/pfctl/pfr2.ok
@@ -22,9 +22,9 @@ A  fe80::1
 D  ::1
 D  ::2
 # pass delete -nqvv ::1 ::2 FE80::2
+   fe80::2
 D  ::1
 D  ::2
-   fe80::2
 # pass delete ::1 ::2 FE80::2
 2/3 addresses deleted.
 # pass replace -n ::1 ::2 FE80::1
@@ -35,9 +35,9 @@ D  ::2
 A  ::1
 A  ::2
 # pass replace -nqvv ::1 ::2 FE80::1
+   fe80::1
 A  ::1
 A  ::2
-   fe80::1
 # pass replace ::1 ::2 FE80::1
 2 addresses added.
 # pass test ::1 ::2 FE80::1
diff --git a/regress/sbin/pfctl/pfr3.ok b/regress/sbin/pfctl/pfr3.ok
index d14fc891498..f7cef55f68e 100644
--- a/regress/sbin/pfctl/pfr3.ok
+++ b/regress/sbin/pfctl/pfr3.ok
@@ -29,11 +29,11 @@ D  10.11.12.0/24
 # pass delete 10.11.0.0/16 10.11.12.0/24
 2/2 addresses deleted.
 # pass replace -n 10.0/8 172.16.0/12 192.168.0/16
-2 addresses added (dummy).
 1 addresses deleted (dummy).
-# pass replace -nf-
 2 addresses added (dummy).
+# pass replace -nf-
 1 addresses deleted (dummy).
+2 addresses added (dummy).
 # pass replace -nqv 10.0/8 172.16.0/12 192.168.0/16
 A  172.16.0.0/12
 A  192.168.0.0/16
diff --git a/regress/sbin/pfctl/pfr4.ok b/regress/sbin/pfctl/pfr4.ok
index c45e2c51513..8a9eeab4ad1 100644
--- a/regress/sbin/pfctl/pfr4.ok
+++ b/regress/sbin/pfctl/pfr4.ok
@@ -40,14 +40,15 @@ A  0.0.0.0/7
 8 addresses added (dummy).
 8 addresses deleted (dummy).
 # pass replace -nqv 0/8 0/9 0/10 0/11 0/12 0/13 0/14 0/15
-A  0.0.0.0/8
-A  0.0.0.0/9
 A  0.0.0.0/10
 A  0.0.0.0/11
 A  0.0.0.0/12
 A  0.0.0.0/13
 A  0.0.0.0/14
 A  0.0.0.0/15
+A  0.0.0.0/8
+A  0.0.0.0/9
+D  0.0.0.0/0
 D  0.0.0.0/1
 D  0.0.0.0/2
 D  0.0.0.0/3
@@ -55,16 +56,16 @@ D  0.0.0.0/4
 D  0.0.0.0/5
 D  0.0.0.0/6
 D  0.0.0.0/7
-D  0.0.0.0/0
 # pass replace -nqvv 0/8 0/9 0/10 0/11 0/12 0/13 0/14 0/15
-A  0.0.0.0/8
-A  0.0.0.0/9
 A  0.0.0.0/10
 A  0.0.0.0/11
 A  0.0.0.0/12
 A  0.0.0.0/13
 A  0.0.0.0/14
 A  0.0.0.0/15
+A  0.0.0.0/8
+A  0.0.0.0/9
+D  0.0.0.0/0
 D  0.0.0.0/1
 D  0.0.0.0/2
 D  0.0.0.0/3
@@ -72,7 +73,6 @@ D  0.0.0.0/4
 D  0.0.0.0/5
 D  0.0.0.0/6
 D  0.0.0.0/7
-D  0.0.0.0/0
 # pass replace 0/8 0/9 0/10 0/11 0/12 0/13 0/14 0/15
 8 addresses added.
 8 addresses deleted.
@@ -100,14 +100,14 @@ A  0.0.0.0/20
 A  0.0.0.0/21
 A  0.0.0.0/22
 A  0.0.0.0/23
-D  0.0.0.0/8
-D  0.0.0.0/9
 D  0.0.0.0/10
 D  0.0.0.0/11
 D  0.0.0.0/12
 D  0.0.0.0/13
 D  0.0.0.0/14
 D  0.0.0.0/15
+D  0.0.0.0/8
+D  0.0.0.0/9
 # pass replace -nqvv 0/16 0/17 0/18 0/19 0/20 0/21 0/22 0/23
 A  0.0.0.0/16
 A  0.0.0.0/17
@@ -117,14 +117,14 @@ A  0.0.0.0/20
 A  0.0.0.0/21
 A  0.0.0.0/22
 A  0.0.0.0/23
-D  0.0.0.0/8
-D  0.0.0.0/9
 D  0.0.0.0/10
 D  0.0.0.0/11
 D  0.0.0.0/12
 D  0.0.0.0/13
 D  0.0.0.0/14
 D  0.0.0.0/15
+D  0.0.0.0/8
+D  0.0.0.0/9
 # pass replace 0/16 0/17 0/18 0/19 0/20 0/21 0/22 0/23
 8 addresses added.
 8 addresses deleted.
diff --git a/regress/sbin/pfctl/pfr5.ok b/regress/sbin/pfctl/pfr5.ok
index f1dcced617a..d157aa16cdd 100644
--- a/regress/sbin/pfctl/pfr5.ok
+++ b/regress/sbin/pfctl/pfr5.ok
@@ -40,14 +40,15 @@ A  ::/7
 8 addresses added (dummy).
 8 addresses deleted (dummy).
 # pass replace -nqv ::/8 ::/9 ::/10 ::/11 ::/12 ::/13 ::/14 ::/15
-A  ::/8
-A  ::/9
 A  ::/10
 A  ::/11
 A  ::/12
 A  ::/13
 A  ::/14
 A  ::/15
+A  ::/8
+A  ::/9
+D  ::/0
 D  ::/1
 D  ::/2
 D  ::/3
@@ -55,16 +56,16 @@ D  ::/4
 D  ::/5
 D  ::/6
 D  ::/7
-D  ::/0
 # pass replace -nqvv ::/8 ::/9 ::/10 ::/11 ::/12 ::/13 ::/14 ::/15
-A  ::/8
-A  ::/9
 A  ::/10
 A  ::/11
 A  ::/12
 A  ::/13
 A  ::/14
 A  ::/15
+A  ::/8
+A  ::/9
+D  ::/0
 D  ::/1
 D  ::/2
 D  ::/3
@@ -72,7 +73,6 @@ D  ::/4
 D  ::/5
 D  ::/6
 D  ::/7
-D  ::/0
 # pass replace ::/8 ::/9 ::/10 ::/11 ::/12 ::/13 ::/14 ::/15
 8 addresses added.
 8 addresses deleted.
@@ -100,14 +100,14 @@ A  ::/20
 A  ::/21
 A  ::/22
 A  ::/23
-D  ::/8
-D  ::/9
 D  ::/10
 D  ::/11
 D  ::/12
 D  ::/13
 D  ::/14
 D  ::/15
+D  ::/8
+D  ::/9
 # pass replace -nqvv ::/16 ::/17 ::/18 ::/19 ::/20 ::/21 ::/22 ::/23
 A  ::/16
 A  ::/17
@@ -117,14 +117,14 @@ A  ::/20
 A  ::/21
 A  ::/22
 A  ::/23
-D  ::/8
-D  ::/9
 D  ::/10
 D  ::/11
 D  ::/12
 D  ::/13
 D  ::/14
 D  ::/15
+D  ::/8
+D  ::/9
 # pass replace ::/16 ::/17 ::/18 ::/19 ::/20 ::/21 ::/22 ::/23
 8 addresses added.
 8 addresses deleted.
@@ -612,14 +612,14 @@ D  ::/87
 8 addresses added (dummy).
 8 addresses deleted (dummy).
 # pass replace -nqv ::/96 ::/97 ::/98 ::/99 ::/100 ::/101 ::/102 ::/103
-A  ::/96
-A  ::/97
-A  ::/98
-A  ::/99
 A  ::/100
 A  ::/101
 A  ::/102
 A  ::/103
+A  ::/96
+A  ::/97
+A  ::/98
+A  ::/99
 D  ::/88
 D  ::/89
 D  ::/90
@@ -629,14 +629,14 @@ D  ::/93
 D  ::/94
 D  ::/95
 # pass replace -nqvv ::/96 ::/97 ::/98 ::/99 ::/100 ::/101 ::/102 ::/103
-A  ::/96
-A  ::/97
-A  ::/98
-A  ::/99
 A  ::/100
 A  ::/101
 A  ::/102
 A  ::/103
+A  ::/96
+A  ::/97
+A  ::/98
+A  ::/99
 D  ::/88
 D  ::/89
 D  ::/90
@@ -672,14 +672,14 @@ A  ::/108
 A  ::/109
 A  ::/110
 A  ::/111
-D  ::/96
-D  ::/97
-D  ::/98
-D  ::/99
 D  ::/100
 D  ::/101
 D  ::/102
 D  ::/103
+D  ::/96
+D  ::/97
+D  ::/98
+D  ::/99
 # pass replace -nqvv ::/104 ::/105 ::/106 ::/107 ::/108 ::/109 ::/110 ::/111
 A  ::/104
 A  ::/105
@@ -689,14 +689,14 @@ A  ::/108
 A  ::/109
 A  ::/110
 A  ::/111
-D  ::/96
-D  ::/97
-D  ::/98
-D  ::/99
 D  ::/100
 D  ::/101
 D  ::/102
 D  ::/103
+D  ::/96
+D  ::/97
+D  ::/98
+D  ::/99
 # pass replace ::/104 ::/105 ::/106 ::/107 ::/108 ::/109 ::/110 ::/111
 8 addresses added.
 8 addresses deleted.
diff --git a/regress/sbin/pfctl/pfr6.ok b/regress/sbin/pfctl/pfr6.ok
index 20d23004294..ca045de5986 100644
--- a/regress/sbin/pfctl/pfr6.ok
+++ b/regress/sbin/pfctl/pfr6.ok
@@ -6,17 +6,17 @@
 6/6 addresses added (dummy).
 # pass add -nqv 1.1.1.1 !1.1.1.2 10.10 !10.11 ::1 !::2
 A  1.1.1.1
-A !1.1.1.2
 A  10.10.0.0/16
-A !10.11.0.0/16
 A  ::1
+A !1.1.1.2
+A !10.11.0.0/16
 A !::2
 # pass add -nqvv 1.1.1.1 !1.1.1.2 10.10 !10.11 ::1 !::2
 A  1.1.1.1
-A !1.1.1.2
 A  10.10.0.0/16
-A !10.11.0.0/16
 A  ::1
+A !1.1.1.2
+A !10.11.0.0/16
 A !::2
 # pass add 1.1.1.1 !1.1.1.2 10.10 !10.11 ::1 !::2
 6/6 addresses added.
@@ -36,19 +36,19 @@ A !::2
 # pass replace -nqv 1.1.1.1 !1.1.1.2 !!1.1.1.3 !!!1.1.1.4
 A  1.1.1.3
 A !1.1.1.4
-D !::2
+D  10.10.0.0/16
 D  ::1
 D !10.11.0.0/16
-D  10.10.0.0/16
+D !::2
 # pass replace -nqvv 1.1.1.1 !1.1.1.2 !!1.1.1.3 !!!1.1.1.4
    1.1.1.1
   !1.1.1.2
 A  1.1.1.3
 A !1.1.1.4
-D !::2
+D  10.10.0.0/16
 D  ::1
 D !10.11.0.0/16
-D  10.10.0.0/16
+D !::2
 # pass replace 1.1.1.1 !1.1.1.2 !!1.1.1.3 !!!1.1.1.4
 2 addresses added.
 4 addresses deleted.
@@ -65,22 +65,22 @@ D  10.10.0.0/16
 4 addresses deleted (dummy).
 # pass replace -nqv fe80::/16 !fe81::/16 !!fe82::/16 !!!fe83::/16
 A  fe80::/16
-A !fe81::/16
 A  fe82::/16
+A !fe81::/16
 A !fe83::/16
-D !1.1.1.4
+D  1.1.1.1
 D  1.1.1.3
 D !1.1.1.2
-D  1.1.1.1
+D !1.1.1.4
 # pass replace -nqvv fe80::/16 !fe81::/16 !!fe82::/16 !!!fe83::/16
 A  fe80::/16
-A !fe81::/16
 A  fe82::/16
+A !fe81::/16
 A !fe83::/16
-D !1.1.1.4
+D  1.1.1.1
 D  1.1.1.3
 D !1.1.1.2
-D  1.1.1.1
+D !1.1.1.4
 # pass replace fe80::/16 !fe81::/16 !!fe82::/16 !!!fe83::/16
 4 addresses added.
 4 addresses deleted.
@@ -97,22 +97,22 @@ D  1.1.1.1
 4 addresses deleted (dummy).
 # pass replace -nqv 10 !10.10 10.10.10 !10.10.10.10
 A  10.0.0.0/8
-A !10.10.0.0/16
 A  10.10.10.0/24
+A !10.10.0.0/16
 A !10.10.10.10
-D !fe83::/16
+D  fe80::/16
 D  fe82::/16
 D !fe81::/16
-D  fe80::/16
+D !fe83::/16
 # pass replace -nqvv 10 !10.10 10.10.10 !10.10.10.10
 A  10.0.0.0/8
-A !10.10.0.0/16
 A  10.10.10.0/24
+A !10.10.0.0/16
 A !10.10.10.10
-D !fe83::/16
+D  fe80::/16
 D  fe82::/16
 D !fe81::/16
-D  fe80::/16
+D !fe83::/16
 # pass replace 10 !10.10 10.10.10 !10.10.10.10
 4 addresses added.
 4 addresses deleted.
@@ -122,12 +122,12 @@ D  fe80::/16
 3/3 addresses added (dummy).
 # pass add -nqv fe80::/16 !fe80:fe80::/32 fe80:fe80:fe80::/48
 A  fe80::/16
-A !fe80:fe80::/32
 A  fe80:fe80:fe80::/48
+A !fe80:fe80::/32
 # pass add -nqvv fe80::/16 !fe80:fe80::/32 fe80:fe80:fe80::/48
 A  fe80::/16
-A !fe80:fe80::/32
 A  fe80:fe80:fe80::/48
+A !fe80:fe80::/32
 # pass add fe80::/16 !fe80:fe80::/32 fe80:fe80:fe80::/48
 3/3 addresses added.
 # pass show 
diff --git a/regress/sbin/pfctl/pfr8.ok b/regress/sbin/pfctl/pfr8.ok
index 0a3f8c95b14..b0f2aea2f05 100644
--- a/regress/sbin/pfctl/pfr8.ok
+++ b/regress/sbin/pfctl/pfr8.ok
@@ -5,11 +5,11 @@
 # pass add -nf-
 2/2 addresses added (dummy).
 # pass add -nqv localhost
-A  ::1
 A  127.0.0.1
-# pass add -nqvv localhost
 A  ::1
+# pass add -nqvv localhost
 A  127.0.0.1
+A  ::1
 # pass add localhost
 2/2 addresses added.
 # fail add invalid$host
diff --git a/regress/sbin/pfctl/pfr9.ok b/regress/sbin/pfctl/pfr9.ok
index d5f6c5edde9..a7cb22f431e 100644
--- a/regress/sbin/pfctl/pfr9.ok
+++ b/regress/sbin/pfctl/pfr9.ok
@@ -23,9 +23,9 @@ X  ::1
 # pass add -nqv 1.2.3.4 ::1 1.2.3.4 ::1
 # pass add -nqvv 1.2.3.4 ::1 1.2.3.4 ::1
    1.2.3.4
-   ::1
    1.2.3.4
    ::1
+   ::1
 # pass add 1.2.3.4 ::1 1.2.3.4 ::1
 0/4 addresses added.
 # pass delete -n 1.2.3.4 ::1 1.2.3.4 ::1
@@ -51,9 +51,9 @@ X  ::1
 # pass delete -nqv 1.2.3.4 ::1 1.2.3.4 ::1
 # pass delete -nqvv 1.2.3.4 ::1 1.2.3.4 ::1
    1.2.3.4
-   ::1
    1.2.3.4
    ::1
+   ::1
 # pass delete 1.2.3.4 ::1 1.2.3.4 ::1
 0/4 addresses deleted.
 # pass replace -n 1.2.3.4 ::1 1.2.3.4 ::1