From 6ade11e99c83c3c60f0c150621c02ac0b4a860ed Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Sun, 16 Jun 2019 17:27:31 -0400
Subject: tests/exe/opkbuild.sh: Update and check archive member ordering

---
(limited to 'tests')

diff --git a/tests/exe/opkbuild.sh b/tests/exe/opkbuild.sh
index 165c7d3..20661a4 100755
--- a/tests/exe/opkbuild.sh
+++ b/tests/exe/opkbuild.sh
@@ -27,7 +27,7 @@ ls_outer()
 	local opk="${1}"
 	shift 1
 
-	tar -tzf "${opk}" | LC_ALL=POSIX sort
+	tar -tzf "${opk}"
 }
 
 ls_inner()
@@ -36,7 +36,7 @@ ls_inner()
 	local mbr="${2}"
 	shift 2
 
-	tar -xzOf "${opk}" "${mbr}" | tar -tz | LC_ALL=POSIX sort
+	tar -xzOf "${opk}" "${mbr}" | tar -tz
 }
 
 plan_ 12
@@ -52,37 +52,28 @@ for opk in '../src-foo_1.0-1_src_all.opk' \
 		'../bar_1.0-1_all_all.opk'; do
 	command_ok_ 'opk exists' -- [ -f "${opk}" ]
 	cmd_is 'outer archive contents' ls_outer "${opk}" <<-EOF
+		debian-binary
 		control.tar.gz
 		data.tar.gz
-		debian-binary
 		EOF
 done
 cmd_is 'control.tar.gz contents' \
 	ls_inner '../src-foo_1.0-1_src_all.opk' control.tar.gz <<-EOF
-	./
 	./control
 	./md5sums
 	EOF
 cmd_is 'control.tar.gz contents' \
 	ls_inner '../foo_1.0-1_i686-linux-glibc_all.opk' control.tar.gz <<-EOF
-	./
 	./control
 	./md5sums
 	EOF
 cmd_is 'control.tar.gz contents' \
 	ls_inner '../bar_1.0-1_all_all.opk' control.tar.gz <<-EOF
-	./
 	./control
 	EOF
 cmd_is 'data.tar.gz contents' \
 	ls_inner '../foo_1.0-1_i686-linux-glibc_all.opk' data.tar.gz <<-EOF
-	./
-	./usr/
-	./usr/bin/
 	./usr/bin/foo.sh
-	./usr/share/
-	./usr/share/doc/
-	./usr/share/doc/foo/
 	./usr/share/doc/foo/README.dist
 	./usr/share/doc/foo/README.upstream
 	./usr/share/doc/foo/changelog.dist
@@ -90,9 +81,5 @@ cmd_is 'data.tar.gz contents' \
 	EOF
 cmd_is 'data.tar.gz contents' \
 	ls_inner '../bar_1.0-1_all_all.opk' data.tar.gz <<-EOF
-	./
-	./usr/
-	./usr/share/
-	./usr/share/doc/
 	./usr/share/doc/bar
 	EOF
--
cgit v0.9.1