Sorting is dependent on the locale settings, use LC_ALL=C

diff --git a/tests/hash:ip6,port,ip6.t.list0 b/tests/hash:ip6,port,ip6.t.list0
index 4e8f425bf540097f0142faebf3f39a7ece510c6a..8192dfb965a8a99ed6ed10675a73da09c5cbd233 100644 (file)
--- a/tests/hash:ip6,port,ip6.t.list0
+++ b/tests/hash:ip6,port,ip6.t.list0
@@ -4,8 +4,8 @@ Header: family inet6 hashsize 1024 maxelem 65536 timeout x
 Size in memory: 9104
 References: 0
 Members:
-2:1::1,tcp:128,2:2:2::2 timeout x
 2:1::,tcp:128,2:2:2::2 timeout x
-2::1,tcp:5,1:1:1::1 timeout x
+2:1::1,tcp:128,2:2:2::2 timeout x
 2::,tcp:5,1:1:1::1 timeout x
+2::1,tcp:5,1:1:1::1 timeout x
 

diff --git a/tests/hash:ip6,port,net6.t.list0 b/tests/hash:ip6,port,net6.t.list0
index 3898d36a520d99f424a27339e6ee0c66f6c9d8b0..d3d6503b4480d77288fe1be31369e65876b4e2fa 100644 (file)
--- a/tests/hash:ip6,port,net6.t.list0
+++ b/tests/hash:ip6,port,net6.t.list0
@@ -4,8 +4,8 @@ Header: family inet6 hashsize 1024 maxelem 65536
 Size in memory: 9928
 References: 0
 Members:
-2:1::1,tcp:128,::/12
 2:1::,tcp:128,::/12
-2::1,tcp:5,1::/24
+2:1::1,tcp:128,::/12
 2::,tcp:5,1::/24
+2::1,tcp:5,1::/24
 

diff --git a/tests/hash:ip6,port.t.list0 b/tests/hash:ip6,port.t.list0
index 140ea45c1cb57e0c24f8db43f6eafe08474842f1..1336a3f3eacfd15dd6e479ea4ede30a97baeb102 100644 (file)
--- a/tests/hash:ip6,port.t.list0
+++ b/tests/hash:ip6,port.t.list0
@@ -4,8 +4,8 @@ Header: family inet6 hashsize 1024 maxelem 65536 timeout x
 Size in memory: 8848
 References: 0
 Members:
-2:1::1,tcp:128 timeout x
 2:1::,tcp:128 timeout x
-2::1,tcp:5 timeout x
+2:1::1,tcp:128 timeout x
 2::,tcp:5 timeout x
+2::1,tcp:5 timeout x
 

diff --git a/tests/hash:net6,port.t.list0 b/tests/hash:net6,port.t.list0
index 0e26a6e67de5b3718f2d34ffb682f55a8819c898..7c9b46d919c8c95735d6d20b213762b2410254f6 100644 (file)
--- a/tests/hash:net6,port.t.list0
+++ b/tests/hash:net6,port.t.list0
@@ -4,8 +4,8 @@ Header: family inet6 hashsize 128 maxelem 65536 timeout x
 Size in memory: 2328
 References: 0
 Members:
-1:1:1::1,tcp:8 timeout x
 192:160::/27,ipv6-icmp:echo-request timeout x
+1:1:1::1,tcp:8 timeout x
 2::/24,tcp:8 timeout x
 3::1,tcp:8 timeout x
 

diff --git a/tests/hash:net6.t.list0 b/tests/hash:net6.t.list0
index 47a4663cc71fbc56acf377dd8390269c082c0aae..afe1f2c67fa8fdb081e3e50406165163d7a74daf 100644 (file)
--- a/tests/hash:net6.t.list0
+++ b/tests/hash:net6.t.list0
@@ -4,8 +4,8 @@ Header: family inet6 hashsize 128 maxelem 65536 timeout x
 Size in memory: 2696
 References: 0
 Members:
-1:1:1::1 timeout x
 192:160::/27 timeout x
+1:1:1::1 timeout x
 2::/24 timeout x
 3::1 timeout x
 

diff --git a/tests/runtest.sh b/tests/runtest.sh
index ae0780ea16b76839e195814152a26ef6d333f3a6..692ac3e7045629faadf1ae56c922fd4edac550c6 100755 (executable)
--- a/tests/runtest.sh
+++ b/tests/runtest.sh
@@ -13,6 +13,10 @@ tests="$tests hash:ip,port,net hash:ip6,port,net6"
 tests="$tests setlist"
 tests="$tests iptree iptreemap"
 
+# For correct sorting:
+LC_ALL=C
+export LC_ALL
+
 add_tests() {
        # inet|inet6 network
        if [ $1 = "inet" ]; then