[runtime/test] Move test list files (#9397)

Move test list files into tests/scripts/list

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>

diff --git a/docs/nnfw/howto/CrossBuildForArm.md b/docs/nnfw/howto/CrossBuildForArm.md
index 94d1645..8d0a25f 100644 (file)
--- a/docs/nnfw/howto/CrossBuildForArm.md
+++ b/docs/nnfw/howto/CrossBuildForArm.md
@@ -124,5 +124,5 @@ option(BUILD_NEURUN "Build neurun" ON)
 - neurun
 ```
  ./tests/scripts/test_driver.sh --artifactpath=. \
- --frameworktest_list_file=tests/scripts/neurun_frameworktest_list.armv7l.acl_cl.txt
+ --frameworktest_list_file=tests/scripts/list/neurun_frameworktest_list.armv7l.acl_cl.txt
 ```

diff --git a/infra/scripts/test_arm_neurun_acl_cl.sh b/infra/scripts/test_arm_neurun_acl_cl.sh
index 656b25c..1660084 100755 (executable)
--- a/infra/scripts/test_arm_neurun_acl_cl.sh
+++ b/infra/scripts/test_arm_neurun_acl_cl.sh
@@ -25,7 +25,7 @@ pushd ${ROOT_PATH} > /dev/null
 ./tests/scripts/test_driver.sh \
   --frameworktest \
   --framework_driverbin="$ROOT_PATH/Product/out/bin/tflite_loader_test_tool" \
-  --frameworktest_list_file=tests/scripts/tflite_loader_list.armv7l.txt \
+  --frameworktest_list_file=tests/scripts/list/tflite_loader_list.armv7l.txt \
   --reportdir="$ROOT_PATH/report/acl_cl/tfliteloader" .
 popd > /dev/null
 

diff --git a/infra/scripts/test_arm_neurun_acl_neon.sh b/infra/scripts/test_arm_neurun_acl_neon.sh
index 23a4a8d..c2cd805 100755 (executable)
--- a/infra/scripts/test_arm_neurun_acl_neon.sh
+++ b/infra/scripts/test_arm_neurun_acl_neon.sh
@@ -7,7 +7,7 @@ CheckTestPrepared
 
 BACKEND="acl_neon"
 UNITTEST_SKIPLIST="Product/out/unittest/nnapi_gtest.skip.armv7l-linux.acl_neon"
-FRAMEWORK_TESTLIST="tests/scripts/neurun_frameworktest_list.armv7l.acl_neon.txt"
+FRAMEWORK_TESTLIST="tests/scripts/list/neurun_frameworktest_list.armv7l.acl_neon.txt"
 REPORT_BASE="report/${BACKEND}"
 EXECUTORS=("Linear" "Dataflow" "Parallel")
 
@@ -24,4 +24,4 @@ unset EXECUTOR
 # TODO Independent script when supporting ops are increased
 export NCNN_LAYOUT="NCHW"
 Unittests "srcn" "Product/out/unittest/nnapi_gtest.skip.armv7l-linux.ncnn" "report/ncnn"
-TFLiteModelVerification "srcn" "tests/scripts/neurun_frameworktest_list.armv7l.ncnn.txt" "report/ncnn"
+TFLiteModelVerification "srcn" "tests/scripts/list/neurun_frameworktest_list.armv7l.ncnn.txt" "report/ncnn"

diff --git a/infra/scripts/test_arm_neurun_cpu.sh b/infra/scripts/test_arm_neurun_cpu.sh
index 2c55709..ac2f35a 100755 (executable)
--- a/infra/scripts/test_arm_neurun_cpu.sh
+++ b/infra/scripts/test_arm_neurun_cpu.sh
@@ -7,7 +7,7 @@ CheckTestPrepared
 
 BACKEND="cpu"
 UNITTEST_SKIPLIST="Product/out/unittest/nnapi_gtest.skip.armv7l-linux.cpu"
-FRAMEWORK_TESTLIST="tests/scripts/neurun_frameworktest_list.armv7l.cpu.txt"
+FRAMEWORK_TESTLIST="tests/scripts/list/neurun_frameworktest_list.armv7l.cpu.txt"
 REPORT_BASE="report/${BACKEND}"
 EXECUTORS=("Linear" "Dataflow" "Parallel")
 

diff --git a/infra/scripts/test_arm_neurun_mixed.sh b/infra/scripts/test_arm_neurun_mixed.sh
index 97b0e6e..b528a45 100755 (executable)
--- a/infra/scripts/test_arm_neurun_mixed.sh
+++ b/infra/scripts/test_arm_neurun_mixed.sh
@@ -13,7 +13,7 @@ BACKENDS=(cpu acl_neon)
 
 # Get the intersect of framework test list files
 # acl_cl is default. Other backends have own test list
-TESTLIST_PREFIX="tests/scripts/neurun_frameworktest_list.armv7l"
+TESTLIST_PREFIX="tests/scripts/list/neurun_frameworktest_list.armv7l"
 cat $TESTLIST_PREFIX.${BACKENDS[0]}.txt | sort > $TESTLIST_PREFIX.intersect.txt
 for BACKEND in "${BACKENDS[@]}"; do
     comm -12 <(sort $TESTLIST_PREFIX.intersect.txt) <(sort $TESTLIST_PREFIX.$BACKEND.txt) > $TESTLIST_PREFIX.intersect.next.txt

diff --git a/infra/scripts/test_x64_neurun_cpu.sh b/infra/scripts/test_x64_neurun_cpu.sh
index 9f321b4..b755783 100755 (executable)
--- a/infra/scripts/test_x64_neurun_cpu.sh
+++ b/infra/scripts/test_x64_neurun_cpu.sh
@@ -7,6 +7,6 @@ pushd ${ROOT_PATH} > /dev/null
 
 CheckTestPrepared
 Unittests "cpu" "Product/out/unittest/nnapi_gtest.skip.x86_64-linux" "report"
-TFLiteModelVerification "cpu" "tests/scripts/neurun_frameworktest_list.x86-64.cpu.txt" "report"
+TFLiteModelVerification "cpu" "tests/scripts/list/neurun_frameworktest_list.x86-64.cpu.txt" "report"
 
 popd > /dev/null

diff --git a/tests/scripts/neurun_frameworktest_list.armv7l.acl_neon.txt b/tests/scripts/list/neurun_frameworktest_list.armv7l.acl_neon.txt
similarity index 100%
rename from tests/scripts/neurun_frameworktest_list.armv7l.acl_neon.txt
rename to tests/scripts/list/neurun_frameworktest_list.armv7l.acl_neon.txt

diff --git a/tests/scripts/neurun_frameworktest_list.armv7l.cpu.txt b/tests/scripts/list/neurun_frameworktest_list.armv7l.cpu.txt
similarity index 100%
rename from tests/scripts/neurun_frameworktest_list.armv7l.cpu.txt
rename to tests/scripts/list/neurun_frameworktest_list.armv7l.cpu.txt

diff --git a/tests/scripts/neurun_frameworktest_list.armv7l.ncnn.txt b/tests/scripts/list/neurun_frameworktest_list.armv7l.ncnn.txt
similarity index 100%
rename from tests/scripts/neurun_frameworktest_list.armv7l.ncnn.txt
rename to tests/scripts/list/neurun_frameworktest_list.armv7l.ncnn.txt

diff --git a/tests/scripts/neurun_frameworktest_list.x86-64.cpu.txt b/tests/scripts/list/neurun_frameworktest_list.x86-64.cpu.txt
similarity index 100%
rename from tests/scripts/neurun_frameworktest_list.x86-64.cpu.txt
rename to tests/scripts/list/neurun_frameworktest_list.x86-64.cpu.txt

diff --git a/tests/scripts/tflite_loader_list.armv7l.txt b/tests/scripts/list/tflite_loader_list.armv7l.txt
similarity index 100%
rename from tests/scripts/tflite_loader_list.armv7l.txt
rename to tests/scripts/list/tflite_loader_list.armv7l.txt

diff --git a/tests/scripts/run_frameworktest.sh b/tests/scripts/run_frameworktest.sh
index df840df..e691d5f 100755 (executable)
--- a/tests/scripts/run_frameworktest.sh
+++ b/tests/scripts/run_frameworktest.sh
@@ -27,7 +27,7 @@ function Usage()
     echo "./$0 \\"
     echo "  --runtestsh=tests/framework/run_test.sh \\ # Test runner script path"
     echo "  --driverbin=Product/out/bin/tflite_run \\  # Test driver path"
-    echo "  --frameworktest_list_file=tests/scripts/neurun_frameworktest_list.armv7l.cpu.txt \\"
+    echo "  --frameworktest_list_file=tests/scripts/list/neurun_frameworktest_list.armv7l.cpu.txt \\"
     echo "  --reportdir=report \\            # Directory for the report files will be saved"
     echo "  --tapname=framework_test.tap \\  # Tap file name"
     echo "  --logname=framework_test.log \\  # Log file name"