Merge branch 'feature/use-shld'

1 files changed, 34 insertions, 51 deletions

diff --git a/tests/plat_is_concerned.sh b/tests/plat_is_concerned.sh
index 2bc808b..126e36a 100755
--- a/tests/plat_is_concerned.sh
+++ b/tests/plat_is_concerned.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 host_plat="${1}"
@@ -47,50 +43,37 @@ do_test()
 	fi
 }
 
-# Platform: all
-
-do_test dev 'all' false
-
-do_test ao751h 'all' false
-
-do_test all 'all' true
-
-# Platform: any
-
-do_test dev 'any' true
-
-do_test ao751h 'any' true
-
-do_test all 'any' false
-
-# Platform: dev
-
-do_test dev 'dev' true
-
-do_test ao751h 'dev' false
-
-do_test all 'dev' false
-
-# Platform: !dev
-
-do_test dev '!dev' false
-
-do_test ao751h '!dev' true
-
-do_test all '!dev' false
-
-# Platform: dev dimension2400
-
-do_test 'dev' 'dev dimension2400' true
-
-do_test 'ao751h' 'dev dimension2400' false
-
-do_test 'all' 'dev dimension2400' false
-
-# Platform: dev all
-
-do_test 'dev' 'dev all' true
-
-do_test 'ao751h' 'dev all' false
-
-do_test 'all' 'dev all' true
+main()
+{
+	# Platform: all
+	do_test dev 'all' false
+	do_test ao751h 'all' false
+	do_test all 'all' true
+
+	# Platform: any
+	do_test dev 'any' true
+	do_test ao751h 'any' true
+	do_test all 'any' false
+
+	# Platform: dev
+	do_test dev 'dev' true
+	do_test ao751h 'dev' false
+	do_test all 'dev' false
+
+	# Platform: !dev
+	do_test dev '!dev' false
+	do_test ao751h '!dev' true
+	do_test all '!dev' false
+
+	# Platform: dev dimension2400
+	do_test 'dev' 'dev dimension2400' true
+	do_test 'ao751h' 'dev dimension2400' false
+	do_test 'all' 'dev dimension2400' false
+
+	# Platform: dev all
+	do_test 'dev' 'dev all' true
+	do_test 'ao751h' 'dev all' false
+	do_test 'all' 'dev all' true
+
+	return 0
+}