Merge branch 'feature/use-shld'

1 files changed, 17 insertions, 16 deletions

diff --git a/tests/match_arch.sh b/tests/match_arch.sh
index f9b8a22..35f943b 100755
--- a/tests/match_arch.sh
+++ b/tests/match_arch.sh
@@ -20,10 +20,6 @@
 # along with the ProteanOS Development Kit.  If not, see
 # <http://www.gnu.org/licenses/>.
 
-. "${srcdir}/tests/common.sh"
-
-use archplat
-
 do_test()
 {
 	local arch="${1}"
@@ -47,26 +43,31 @@ do_test()
 	fi
 }
 
-do_test all 'all' true
+main()
+{
+	do_test all 'all' true
 
-do_test foo-bar-baz 'any' true
+	do_test foo-bar-baz 'any' true
 
-do_test foo-bar-baz 'any all' true
+	do_test foo-bar-baz 'any all' true
 
-do_test all 'any all' true
+	do_test all 'any all' true
 
-do_test foo-bar-baz 'foo-bar-baz' true
+	do_test foo-bar-baz 'foo-bar-baz' true
 
-do_test foo-bar-baz 'foo-any-any' true
+	do_test foo-bar-baz 'foo-any-any' true
 
-do_test foo-bar-baz 'foo-bar-qux' false
+	do_test foo-bar-baz 'foo-bar-qux' false
 
-do_test foo-bar-baz 'any-qux-any any-bar-any' true
+	do_test foo-bar-baz 'any-qux-any any-bar-any' true
 
-do_test foo-bar-baz 'any-qux-any any-quux-any' false
+	do_test foo-bar-baz 'any-qux-any any-quux-any' false
 
-do_test all 'any' false
+	do_test all 'any' false
 
-do_test any 'all' false
+	do_test any 'all' false
 
-do_test all 'foo-any-any' false
+	do_test all 'foo-any-any' false
+
+	return 0
+}