Make table tests less sensitive to environmental conditions.

ok dhartmei@

5 files changed, 144 insertions, 144 deletions

diff --git a/regress/sbin/pfctl/pfr.exec b/regress/sbin/pfctl/pfr.exec
index 98868b51b1c..9c37cd6230a 100644
--- a/regress/sbin/pfctl/pfr.exec
+++ b/regress/sbin/pfctl/pfr.exec
@@ -54,7 +54,7 @@ for LINE in `sed -e "s/ /_/g" $1`; do
 			echo $ARGS | pfctl -a regress:regress -f- 2>&1 || exit 1
 			;;
 		*)
-			pfctl -t regress -T $CMD $ARGS 2>&1 || exit 1
+			pfctl -t regress -T $CMD $ARGS 2>&1 | sort || exit 1
 			;;
 		esac
 	else
diff --git a/regress/sbin/pfctl/pfr3.ok b/regress/sbin/pfctl/pfr3.ok
index 2343b99974f..d14fc891498 100644
--- a/regress/sbin/pfctl/pfr3.ok
+++ b/regress/sbin/pfctl/pfr3.ok
@@ -44,8 +44,8 @@ A  172.16.0.0/12
 A  192.168.0.0/16
 D  10.11.12.13
 # pass replace 10.0/8 172.16.0/12 192.168.0/16
-2 addresses added.
 1 addresses deleted.
+2 addresses added.
 # pass test 10.1.1.1 172.17.1.1 192.168.1.1
 3/3 addresses match.
 # fail test 11.1.1.1
diff --git a/regress/sbin/pfctl/pfr4.ok b/regress/sbin/pfctl/pfr4.ok
index cb1a384147b..c45e2c51513 100644
--- a/regress/sbin/pfctl/pfr4.ok
+++ b/regress/sbin/pfctl/pfr4.ok
@@ -26,13 +26,13 @@ A  0.0.0.0/7
 8 addresses added.
 # pass show 
    0.0.0.0/0
-   0.0.0.0/7
-   0.0.0.0/6
-   0.0.0.0/5
-   0.0.0.0/4
-   0.0.0.0/3
-   0.0.0.0/2
    0.0.0.0/1
+   0.0.0.0/2
+   0.0.0.0/3
+   0.0.0.0/4
+   0.0.0.0/5
+   0.0.0.0/6
+   0.0.0.0/7
 # pass replace -n 0/8 0/9 0/10 0/11 0/12 0/13 0/14 0/15
 8 addresses added (dummy).
 8 addresses deleted (dummy).
@@ -77,14 +77,14 @@ D  0.0.0.0/0
 8 addresses added.
 8 addresses deleted.
 # pass show 
-   0.0.0.0/15
-   0.0.0.0/14
-   0.0.0.0/13
-   0.0.0.0/12
-   0.0.0.0/11
    0.0.0.0/10
-   0.0.0.0/9
+   0.0.0.0/11
+   0.0.0.0/12
+   0.0.0.0/13
+   0.0.0.0/14
+   0.0.0.0/15
    0.0.0.0/8
+   0.0.0.0/9
 # pass replace -n 0/16 0/17 0/18 0/19 0/20 0/21 0/22 0/23
 8 addresses added (dummy).
 8 addresses deleted (dummy).
@@ -129,14 +129,14 @@ D  0.0.0.0/15
 8 addresses added.
 8 addresses deleted.
 # pass show 
-   0.0.0.0/23
-   0.0.0.0/22
-   0.0.0.0/21
-   0.0.0.0/20
-   0.0.0.0/19
-   0.0.0.0/18
-   0.0.0.0/17
    0.0.0.0/16
+   0.0.0.0/17
+   0.0.0.0/18
+   0.0.0.0/19
+   0.0.0.0/20
+   0.0.0.0/21
+   0.0.0.0/22
+   0.0.0.0/23
 # pass replace -n 0/24 0/25 0/26 0/27 0/28 0/29 0/30 0/31
 8 addresses added (dummy).
 8 addresses deleted (dummy).
@@ -181,14 +181,14 @@ D  0.0.0.0/23
 8 addresses added.
 8 addresses deleted.
 # pass show 
-   0.0.0.0/31
-   0.0.0.0/30
-   0.0.0.0/29
-   0.0.0.0/28
-   0.0.0.0/27
-   0.0.0.0/26
-   0.0.0.0/25
    0.0.0.0/24
+   0.0.0.0/25
+   0.0.0.0/26
+   0.0.0.0/27
+   0.0.0.0/28
+   0.0.0.0/29
+   0.0.0.0/30
+   0.0.0.0/31
 # kill
 1 table deleted.
 ktable: 21 allocated, 21 released, 0 leaked.
diff --git a/regress/sbin/pfctl/pfr5.ok b/regress/sbin/pfctl/pfr5.ok
index 6779bdd3091..f1dcced617a 100644
--- a/regress/sbin/pfctl/pfr5.ok
+++ b/regress/sbin/pfctl/pfr5.ok
@@ -26,13 +26,13 @@ A  ::/7
 8 addresses added.
 # pass show 
    ::/0
-   ::/7
-   ::/6
-   ::/5
-   ::/4
-   ::/3
-   ::/2
    ::/1
+   ::/2
+   ::/3
+   ::/4
+   ::/5
+   ::/6
+   ::/7
 # pass replace -n ::/8 ::/9 ::/10 ::/11 ::/12 ::/13 ::/14 ::/15
 8 addresses added (dummy).
 8 addresses deleted (dummy).
@@ -77,14 +77,14 @@ D  ::/0
 8 addresses added.
 8 addresses deleted.
 # pass show 
-   ::/15
-   ::/14
-   ::/13
-   ::/12
-   ::/11
    ::/10
-   ::/9
+   ::/11
+   ::/12
+   ::/13
+   ::/14
+   ::/15
    ::/8
+   ::/9
 # pass replace -n ::/16 ::/17 ::/18 ::/19 ::/20 ::/21 ::/22 ::/23
 8 addresses added (dummy).
 8 addresses deleted (dummy).
@@ -129,14 +129,14 @@ D  ::/15
 8 addresses added.
 8 addresses deleted.
 # pass show 
-   ::/23
-   ::/22
-   ::/21
-   ::/20
-   ::/19
-   ::/18
-   ::/17
    ::/16
+   ::/17
+   ::/18
+   ::/19
+   ::/20
+   ::/21
+   ::/22
+   ::/23
 # pass replace -n ::/24 ::/25 ::/26 ::/27 ::/28 ::/29 ::/30 ::/31
 8 addresses added (dummy).
 8 addresses deleted (dummy).
@@ -181,14 +181,14 @@ D  ::/23
 8 addresses added.
 8 addresses deleted.
 # pass show 
-   ::/31
-   ::/30
-   ::/29
-   ::/28
-   ::/27
-   ::/26
-   ::/25
    ::/24
+   ::/25
+   ::/26
+   ::/27
+   ::/28
+   ::/29
+   ::/30
+   ::/31
 # pass replace -n ::/32 ::/33 ::/34 ::/35 ::/36 ::/37 ::/38 ::/39
 8 addresses added (dummy).
 8 addresses deleted (dummy).
@@ -233,14 +233,14 @@ D  ::/31
 8 addresses added.
 8 addresses deleted.
 # pass show 
-   ::/39
-   ::/38
-   ::/37
-   ::/36
-   ::/35
-   ::/34
-   ::/33
    ::/32
+   ::/33
+   ::/34
+   ::/35
+   ::/36
+   ::/37
+   ::/38
+   ::/39
 # pass replace -n ::/40 ::/41 ::/42 ::/43 ::/44 ::/45 ::/46 ::/47
 8 addresses added (dummy).
 8 addresses deleted (dummy).
@@ -285,14 +285,14 @@ D  ::/39
 8 addresses added.
 8 addresses deleted.
 # pass show 
-   ::/47
-   ::/46
-   ::/45
-   ::/44
-   ::/43
-   ::/42
-   ::/41
    ::/40
+   ::/41
+   ::/42
+   ::/43
+   ::/44
+   ::/45
+   ::/46
+   ::/47
 # pass replace -n ::/48 ::/49 ::/50 ::/51 ::/52 ::/53 ::/54 ::/55
 8 addresses added (dummy).
 8 addresses deleted (dummy).
@@ -337,14 +337,14 @@ D  ::/47
 8 addresses added.
 8 addresses deleted.
 # pass show 
-   ::/55
-   ::/54
-   ::/53
-   ::/52
-   ::/51
-   ::/50
-   ::/49
    ::/48
+   ::/49
+   ::/50
+   ::/51
+   ::/52
+   ::/53
+   ::/54
+   ::/55
 # pass replace -n ::/56 ::/57 ::/58 ::/59 ::/60 ::/61 ::/62 ::/63
 8 addresses added (dummy).
 8 addresses deleted (dummy).
@@ -389,14 +389,14 @@ D  ::/55
 8 addresses added.
 8 addresses deleted.
 # pass show 
-   ::/63
-   ::/62
-   ::/61
-   ::/60
-   ::/59
-   ::/58
-   ::/57
    ::/56
+   ::/57
+   ::/58
+   ::/59
+   ::/60
+   ::/61
+   ::/62
+   ::/63
 # pass replace -n ::/64 ::/65 ::/66 ::/67 ::/68 ::/69 ::/70 ::/71
 8 addresses added (dummy).
 8 addresses deleted (dummy).
@@ -441,14 +441,14 @@ D  ::/63
 8 addresses added.
 8 addresses deleted.
 # pass show 
-   ::/71
-   ::/70
-   ::/69
-   ::/68
-   ::/67
-   ::/66
-   ::/65
    ::/64
+   ::/65
+   ::/66
+   ::/67
+   ::/68
+   ::/69
+   ::/70
+   ::/71
 # pass replace -n ::/72 ::/73 ::/74 ::/75 ::/76 ::/77 ::/78 ::/79
 8 addresses added (dummy).
 8 addresses deleted (dummy).
@@ -493,14 +493,14 @@ D  ::/71
 8 addresses added.
 8 addresses deleted.
 # pass show 
-   ::/79
-   ::/78
-   ::/77
-   ::/76
-   ::/75
-   ::/74
-   ::/73
    ::/72
+   ::/73
+   ::/74
+   ::/75
+   ::/76
+   ::/77
+   ::/78
+   ::/79
 # pass replace -n ::/80 ::/81 ::/82 ::/83 ::/84 ::/85 ::/86 ::/87
 8 addresses added (dummy).
 8 addresses deleted (dummy).
@@ -545,14 +545,14 @@ D  ::/79
 8 addresses added.
 8 addresses deleted.
 # pass show 
-   ::/87
-   ::/86
-   ::/85
-   ::/84
-   ::/83
-   ::/82
-   ::/81
    ::/80
+   ::/81
+   ::/82
+   ::/83
+   ::/84
+   ::/85
+   ::/86
+   ::/87
 # pass replace -n ::/88 ::/89 ::/90 ::/91 ::/92 ::/93 ::/94 ::/95
 8 addresses added (dummy).
 8 addresses deleted (dummy).
@@ -597,14 +597,14 @@ D  ::/87
 8 addresses added.
 8 addresses deleted.
 # pass show 
-   ::/95
-   ::/94
-   ::/93
-   ::/92
-   ::/91
-   ::/90
-   ::/89
    ::/88
+   ::/89
+   ::/90
+   ::/91
+   ::/92
+   ::/93
+   ::/94
+   ::/95
 # pass replace -n ::/96 ::/97 ::/98 ::/99 ::/100 ::/101 ::/102 ::/103
 8 addresses added (dummy).
 8 addresses deleted (dummy).
@@ -649,14 +649,14 @@ D  ::/95
 8 addresses added.
 8 addresses deleted.
 # pass show 
-   ::/103
-   ::/102
-   ::/101
    ::/100
-   ::/99
-   ::/98
-   ::/97
+   ::/101
+   ::/102
+   ::/103
    ::/96
+   ::/97
+   ::/98
+   ::/99
 # pass replace -n ::/104 ::/105 ::/106 ::/107 ::/108 ::/109 ::/110 ::/111
 8 addresses added (dummy).
 8 addresses deleted (dummy).
@@ -701,14 +701,14 @@ D  ::/103
 8 addresses added.
 8 addresses deleted.
 # pass show 
-   ::/111
-   ::/110
-   ::/109
-   ::/108
-   ::/107
-   ::/106
-   ::/105
    ::/104
+   ::/105
+   ::/106
+   ::/107
+   ::/108
+   ::/109
+   ::/110
+   ::/111
 # pass replace -n ::/112 ::/113 ::/114 ::/115 ::/116 ::/117 ::/118 ::/119
 8 addresses added (dummy).
 8 addresses deleted (dummy).
@@ -753,14 +753,14 @@ D  ::/111
 8 addresses added.
 8 addresses deleted.
 # pass show 
-   ::/119
-   ::/118
-   ::/117
-   ::/116
-   ::/115
-   ::/114
-   ::/113
    ::/112
+   ::/113
+   ::/114
+   ::/115
+   ::/116
+   ::/117
+   ::/118
+   ::/119
 # pass replace -n ::/120 ::/121 ::/122 ::/123 ::/124 ::/125 ::/126 ::/127
 8 addresses added (dummy).
 8 addresses deleted (dummy).
@@ -805,14 +805,14 @@ D  ::/119
 8 addresses added.
 8 addresses deleted.
 # pass show 
-   ::/127
-   ::/126
-   ::/125
-   ::/124
-   ::/123
-   ::/122
-   ::/121
    ::/120
+   ::/121
+   ::/122
+   ::/123
+   ::/124
+   ::/125
+   ::/126
+   ::/127
 # kill
 1 table deleted.
 ktable: 81 allocated, 81 released, 0 leaked.
diff --git a/regress/sbin/pfctl/pfr6.ok b/regress/sbin/pfctl/pfr6.ok
index c754baf79f7..20d23004294 100644
--- a/regress/sbin/pfctl/pfr6.ok
+++ b/regress/sbin/pfctl/pfr6.ok
@@ -22,10 +22,10 @@ A !::2
 6/6 addresses added.
 # pass show 
    1.1.1.1
-  !1.1.1.2
    10.10.0.0/16
-  !10.11.0.0/16
    ::1
+  !1.1.1.2
+  !10.11.0.0/16
   !::2
 # pass replace -n 1.1.1.1 !1.1.1.2 !!1.1.1.3 !!!1.1.1.4
 2 addresses added (dummy).
@@ -54,8 +54,8 @@ D  10.10.0.0/16
 4 addresses deleted.
 # pass show 
    1.1.1.1
-  !1.1.1.2
    1.1.1.3
+  !1.1.1.2
   !1.1.1.4
 # pass replace -n fe80::/16 !fe81::/16 !!fe82::/16 !!!fe83::/16
 4 addresses added (dummy).
@@ -86,8 +86,8 @@ D  1.1.1.1
 4 addresses deleted.
 # pass show 
    fe80::/16
-  !fe81::/16
    fe82::/16
+  !fe81::/16
   !fe83::/16
 # pass replace -n 10 !10.10 10.10.10 !10.10.10.10
 4 addresses added (dummy).
@@ -132,12 +132,12 @@ A  fe80:fe80:fe80::/48
 3/3 addresses added.
 # pass show 
    10.0.0.0/8
-  !10.10.0.0/16
    10.10.10.0/24
-  !10.10.10.10
    fe80::/16
-  !fe80:fe80::/32
    fe80:fe80:fe80::/48
+  !10.10.0.0/16
+  !10.10.10.10
+  !fe80:fe80::/32
 # pass test 10.1.1.1 10.10.10.1
 2/2 addresses match.
 # fail test 11.1.1.1 10.10.1.1 10.10.10.10