From a87167806219bb536c86e603e9e38f68a54d654b Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Sat, 04 Jul 2020 22:45:49 -0400
Subject: tests: Verify arch-qualification

---
(limited to 'tests/exe/opkbuild.sh')

diff --git a/tests/exe/opkbuild.sh b/tests/exe/opkbuild.sh
index a14f8d3..e9f0808 100755
--- a/tests/exe/opkbuild.sh
+++ b/tests/exe/opkbuild.sh
@@ -50,7 +50,7 @@ cp -Rp '../src/' 'src/'
 
 command_ok_ 'opkbuild exit status' -- opkbuild -a i686-linux-glibc -p x60 -dc
 for opk in '../src:foo_1.0-1_src_all.opk' \
-		'../foo_1.0-1_i686-linux-glibc_all.opk' \
+		'../foo:i686-linux-glibc_1.0-1_i686-linux-glibc_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
@@ -66,7 +66,8 @@ cmd_is 'control.tar.gz contents' \
 	./md5sums
 	EOF
 cmd_is 'control.tar.gz contents' \
-	ls_inner '../foo_1.0-1_i686-linux-glibc_all.opk' control.tar.gz <<-EOF
+	ls_inner '../foo:i686-linux-glibc_1.0-1_i686-linux-glibc_all.opk' \
+	control.tar.gz <<-EOF
 	./
 	./control
 	./md5sums
@@ -77,18 +78,19 @@ cmd_is 'control.tar.gz contents' \
 	./control
 	EOF
 cmd_is 'data.tar.gz contents' \
-	ls_inner '../foo_1.0-1_i686-linux-glibc_all.opk' data.tar.gz <<-EOF
+	ls_inner '../foo:i686-linux-glibc_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
-	./usr/share/doc/foo/copyright
+	./usr/share/doc/foo:i686-linux-glibc/
+	./usr/share/doc/foo:i686-linux-glibc/README.dist
+	./usr/share/doc/foo:i686-linux-glibc/README.upstream
+	./usr/share/doc/foo:i686-linux-glibc/changelog.dist
+	./usr/share/doc/foo:i686-linux-glibc/copyright
 	EOF
 cmd_is 'data.tar.gz contents' \
 	ls_inner '../bar_1.0-1_all_all.opk' data.tar.gz <<-EOF
--
cgit v0.9.1