[magma] Update test script to use runtests
Removes dependency on device side scripting.
Also easier to see test results.
Change-Id: If66f1cb604f637b83da096faca74cdd035a7dc7c
diff --git a/garnet/lib/magma/scripts/autorun_intel b/garnet/lib/magma/scripts/autorun_intel
index 285c59e..9af407e 100644
--- a/garnet/lib/magma/scripts/autorun_intel
+++ b/garnet/lib/magma/scripts/autorun_intel
@@ -1,27 +1,12 @@
-#!/boot/bin/sh
-echo Welcome to magma autorun -- waiting for device
-while [ ! -e /dev/class/gpu/000 ]; do
- echo "Device not found, sleeping"
- sleep 1
-done
-if [ -z ${GTEST_OUTPUT+x} ]; then
- gtest_output_arg=""
-else
- gtest_output_arg=--gtest_output=$GTEST_OUTPUT
-fi
-echo [UNIT TEST START=]
-run-test-component magma_unit_tests $gtest_output_arg
-run-test-component msd_intel_gen_nonhardware_tests $gtest_output_arg
-### Mesa tests
-run-test-component mesa_unit_tests $gtest_output_arg
-run-test-component fuchsia-pkg://fuchsia.com/magma_intel_gen_nonhardware_tests#meta/state_pool.cmx $gtest_output_arg
-run-test-component state_pool_free_list_only $gtest_output_arg
-run-test-component state_pool_no_free $gtest_output_arg
-run-test-component block_pool_no_free $gtest_output_arg
-echo [UNIT TEST END===]
-echo [INTEGRATION TEST START=]
-run-test-component magma_abi_conformance_tests $gtest_output_arg
-run-test-component msd_intel_gen_integration_tests $gtest_output_arg --gtest_filter=-*Stress*
-run-test-component vkext_unprotected $gtest_output_arg
-run-test-component vkreadback $gtest_output_arg
-echo [INTEGRATION TEST END===]
+/pkgfs/packages/magma_nonhardware_tests/0/test/magma_unit_tests
+/pkgfs/packages/magma_intel_gen_nonhardware_tests/0/test/msd_intel_gen_nonhardware_tests
+/pkgfs/packages/magma_intel_gen_nonhardware_tests/0/test/state_pool
+/pkgfs/packages/magma_intel_gen_nonhardware_tests/0/test/state_pool_free_list_only
+/pkgfs/packages/magma_intel_gen_nonhardware_tests/0/test/state_pool_no_free
+/pkgfs/packages/magma_intel_gen_nonhardware_tests/0/test/block_pool_no_free
+/pkgfs/packages/magma_abi_conformance_tests/0/test/magma_abi_conformance_tests
+/pkgfs/packages/magma_intel_gen_integration_tests/0/test/msd_intel_gen_integration_tests
+/pkgfs/packages/vulkan-tests/0/test/icd_load
+/pkgfs/packages/vulkan-tests/0/test/vkext_unprotected
+/pkgfs/packages/vulkan-tests/0/test/vkreadback
+/pkgfs/packages/vulkan-tests/0/test/vkloop
\ No newline at end of file
diff --git a/garnet/lib/magma/scripts/autorun_mali b/garnet/lib/magma/scripts/autorun_mali
index d222fed..0f53d1f 100644
--- a/garnet/lib/magma/scripts/autorun_mali
+++ b/garnet/lib/magma/scripts/autorun_mali
@@ -1,27 +1,10 @@
-#!/boot/bin/sh
-echo Welcome to magma autorun -- waiting for device
-while [ ! -e /dev/class/gpu/000 ]; do
- echo "Device not found, sleeping"
- sleep 1
-done
-
-if [ -z ${GTEST_OUTPUT+x} ]; then
- gtest_output_arg=""
-else
- gtest_output_arg=--gtest_output=$GTEST_OUTPUT
-fi
-echo [UNIT TEST START=]
-run-test-component magma_unit_tests $gtest_output_arg
-run-test-component msd_arm_mali_nonhardware_tests $gtest_output_arg
-echo [UNIT TEST END===]
-echo [INTEGRATION TEST START=]
-run-test-component magma_abi_conformance_tests $gtest_output_arg
-run-test-component msd_arm_mali_integration_tests $gtest_output_arg
-if [ -e /pkgfs/packages/vulkan-tests/0/test/vkext ]; then
- run-test-component vkext $gtest_output_arg
- run-test-component vkreadback $gtest_output_arg
- run-test-component vk_timer_query_tests $gtest_output_arg
-else
- echo SKIPPED app tests - no /pkgfs/packages/vulkan-tests/0/test/vkext
-fi
-echo [INTEGRATION TEST END===]
+/pkgfs/packages/magma_nonhardware_tests/0/test/magma_unit_tests
+/pkgfs/packages/msd_arm_mali_nonhardware_tests/0/test/msd_arm_mali_nonhardware_tests
+/pkgfs/packages/magma_abi_conformance_tests/0/test/magma_abi_conformance_tests
+/pkgfs/packages/msd-arm-mali-integration-tests/0/test/msd_arm_mali_integration_tests
+/pkgfs/packages/vulkan-tests/0/test/icd_load
+/pkgfs/packages/vulkan-tests/0/test/vkreadback
+/pkgfs/packages/vulkan-tests/0/test/vkloop
+/pkgfs/packages/vulkan-tests/0/test/vkext_protected
+/pkgfs/packages/vulkan-tests/0/test/vkext_unprotected
+/pkgfs/packages/vulkan-tests/0/test/vk_timer_query_tests
\ No newline at end of file
diff --git a/garnet/lib/magma/scripts/autorun_pvr b/garnet/lib/magma/scripts/autorun_pvr
index cebd301..6295482 100644
--- a/garnet/lib/magma/scripts/autorun_pvr
+++ b/garnet/lib/magma/scripts/autorun_pvr
@@ -1,27 +1,5 @@
-#!/boot/bin/sh
-echo Welcome to magma autorun -- waiting for device
-while [ ! -e /dev/class/gpu/000 ]; do
- echo "Device not found, sleeping"
- sleep 1
-done
-
-if [ -z ${GTEST_OUTPUT+x} ]; then
- gtest_output_arg=""
-else
- gtest_output_arg=--gtest_output=$GTEST_OUTPUT
-fi
-echo [UNIT TEST START=]
-run-test-component magma_unit_tests $gtest_output_arg
-run-test-component msd_img_rgx_nonhardware_tests $gtest_output_arg
-echo [UNIT TEST END===]
-echo [INTEGRATION TEST START=]
-run-test-component magma_abi_conformance_tests $gtest_output_arg
-run-test-component msd_img_rgx_integration_tests $gtest_output_arg
-run-test-component msd_img_rgx_no_hardware_integration_tests $gtest_output_arg
-if [ -e /pkgfs/packages/vulkan-tests/0/test/vkext ]; then
- run-test-component vkext $gtest_output_arg
- run-test-component vkreadback $gtest_output_arg
-else
- echo SKIPPED app tests - no /pkgfs/packages/vulkan-tests/0/test/vkext
-fi
-echo [INTEGRATION TEST END===]
+/pkgfs/packages/magma_nonhardware_tests/0/test/magma_unit_tests
+/pkgfs/packages/msd_img_rgx_nonhardware_tests/0/test/msd_img_rgx_nonhardware_tests
+/pkgfs/packages/magma_abi_conformance_tests/0/test/magma_abi_conformance_tests
+/pkgfs/packages/msd_img_rgx_integration_tests/0/test/msd_img_rgx_integration_tests
+/pkgfs/packages/msd_img_rgx_integration_tests/0/test/msd_img_rgx_no_hardware_integration_tests
\ No newline at end of file
diff --git a/garnet/lib/magma/scripts/test.sh b/garnet/lib/magma/scripts/test.sh
index b99e203..6bba4ad 100755
--- a/garnet/lib/magma/scripts/test.sh
+++ b/garnet/lib/magma/scripts/test.sh
@@ -8,8 +8,6 @@
source "$(cd "${script_dir}/../../../../tools/devshell" && pwd)"/lib/vars.sh || exit $?
fx-config-read
-test_out=/tmp/magma_test_out
-
case "$1" in
intel)
fx-command-run cp "${script_dir}/autorun_intel" /tmp/magma_autorun
@@ -27,11 +25,4 @@
;;
esac
-fx-command-run shell "rm -rf ${test_out}; export GTEST_OUTPUT=xml:${test_out}/ && /boot/bin/sh /tmp/magma_autorun"
-
-rm -rf -- "${test_out}"
-mkdir "${test_out}"
-fx-command-run scp "[$(get-fuchsia-device-addr)]:${test_out}/*.xml" "${test_out}"
-
-echo "Grepping for failures:"
-grep failures "${test_out}"/* | grep -v 'failures=\"0\"'
+fx-command-run shell -t runtests -f /tmp/magma_autorun
