From 8ca014410d1b64d802772c168f416d8bcc99fbe3 Mon Sep 17 00:00:00 2001
From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Mon, 11 Apr 2011 10:37:08 +0200
Subject: Sorting is dependent on the locale settings, use LC_ALL=C

---
 tests/hash:ip6,port,ip6.t.list0  | 4 ++--
 tests/hash:ip6,port,net6.t.list0 | 4 ++--
 tests/hash:ip6,port.t.list0      | 4 ++--
 tests/hash:net6,port.t.list0     | 2 +-
 tests/hash:net6.t.list0          | 2 +-
 tests/runtest.sh                 | 4 ++++
 6 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'tests')

diff --git a/tests/hash:ip6,port,ip6.t.list0 b/tests/hash:ip6,port,ip6.t.list0
index 4e8f425..8192dfb 100644
--- 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 3898d36..d3d6503 100644
--- 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 140ea45..1336a3f 100644
--- 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 0e26a6e..7c9b46d 100644
--- 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 47a4663..afe1f2c 100644
--- 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 ae0780e..692ac3e 100755
--- 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
-- 
cgit v1.2.3