summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile6
-rw-r--r--docs/howto/CrossBuildForArm.md2
-rw-r--r--packaging/nnfw.spec2
-rwxr-xr-xscripts/command/tizen_xu4_test.sh6
-rw-r--r--tests/scripts/README.md (renamed from tools/test_driver/README.md)8
-rwxr-xr-xtests/scripts/common.sh (renamed from tools/test_driver/common.sh)0
-rw-r--r--tests/scripts/neurun_frameworktest_list.txt (renamed from tools/test_driver/neurun_frameworktest_list.txt)0
-rw-r--r--tests/scripts/nnfw_kernel_env_list.txt (renamed from tools/test_driver/nnfw_kernel_env_list.txt)0
-rwxr-xr-xtests/scripts/print_to_json.sh (renamed from tools/test_driver/print_to_json.sh)0
-rwxr-xr-xtests/scripts/py/common.py (renamed from tools/test_driver/py/common.py)0
-rwxr-xr-xtests/scripts/py/run_frameworktest.py (renamed from tools/test_driver/py/run_frameworktest.py)0
-rwxr-xr-xtests/scripts/py/run_unittest.py (renamed from tools/test_driver/py/run_unittest.py)0
-rwxr-xr-xtests/scripts/py/test_driver.py (renamed from tools/test_driver/py/test_driver.py)16
-rwxr-xr-xtests/scripts/run_benchmark.sh (renamed from tools/test_driver/run_benchmark.sh)0
-rwxr-xr-xtests/scripts/run_benchmark_acl.sh (renamed from tools/test_driver/run_benchmark_acl.sh)0
-rwxr-xr-xtests/scripts/run_benchmark_op.sh (renamed from tools/test_driver/run_benchmark_op.sh)0
-rw-r--r--tests/scripts/run_benchmark_tflite_model.in (renamed from tools/test_driver/run_benchmark_tflite_model.in)0
-rwxr-xr-xtests/scripts/run_benchmark_tflite_model.sh (renamed from tools/test_driver/run_benchmark_tflite_model.sh)0
-rwxr-xr-xtests/scripts/run_frameworktest.sh (renamed from tools/test_driver/run_frameworktest.sh)0
-rwxr-xr-xtests/scripts/run_unittest.sh (renamed from tools/test_driver/run_unittest.sh)0
-rwxr-xr-xtests/scripts/test_driver.sh (renamed from tools/test_driver/test_driver.sh)0
21 files changed, 23 insertions, 17 deletions
diff --git a/Makefile b/Makefile
index 1ea07d3e0..c4733e161 100644
--- a/Makefile
+++ b/Makefile
@@ -211,16 +211,22 @@ test_internal:
build_test_suite: install_internal
@echo "packaging test suite"
@rm -rf $(INSTALL_ROOT)/test-suite.tar.gz
+ # Workaround for CI test: copy test script to old directory path
+ @cp -rf tests/scripts tools/test_driver
@tar -zcf test-suite.tar.gz tests/ tools/test_driver $(INSTALL_ALIAS) --dereference
+ @rm -rf tools/test_driver
@mv test-suite.tar.gz $(INSTALL_ROOT)/.
build_coverage_suite: install_internal
@echo "packaging test-coverage suite"
@rm -rf $(INSTALL_ROOT)/coverage-suite.tar.gz
@find Product -name "*.gcno" > include_lists.txt
+ # Workaround for CI test: copy test script to old directory path
+ @cp -rf tests/scripts tools/test_driver
@pwd | grep -o '/' | wc -l > tools/test_driver/build_path_depth.txt
@tar -zcf coverage-suite.tar.gz tests/ tools/test_driver $(INSTALL_ALIAS) --dereference -T include_lists.txt
@rm -rf include_lists.txt tools/test_driver/build_path_depth.txt
+ @rm -rf tools/test_driver
@mv coverage-suite.tar.gz $(INSTALL_ROOT)/.
runtime_build_internal: $(BUILD_ROOT)
diff --git a/docs/howto/CrossBuildForArm.md b/docs/howto/CrossBuildForArm.md
index ebba7ec86..e307596d0 100644
--- a/docs/howto/CrossBuildForArm.md
+++ b/docs/howto/CrossBuildForArm.md
@@ -103,5 +103,5 @@ CROSS_BUILD=1 TARGET_ARCH=armv7l make all install
## Run test
```
- ./tools/test_driver/test_driver.sh --artifactpath=.
+ ./tests/scripts/test_driver.sh --artifactpath=.
```
diff --git a/packaging/nnfw.spec b/packaging/nnfw.spec
index 5f7178df8..915c7d366 100644
--- a/packaging/nnfw.spec
+++ b/packaging/nnfw.spec
@@ -82,7 +82,7 @@ rm -rf %{buildroot}%{_libdir}/pureacl
cp -rf ./tests %{buildroot}%{test_install_prefix}/.
## install tools
mkdir -p %{buildroot}%{test_install_prefix}/tools
-cp -rf ./tools/test_driver %{buildroot}%{test_install_prefix}/tools
+cp -rf ./tests/scripts %{buildroot}%{test_install_prefix}/tools
%else
%{build_options} make build_coverage_suite
mkdir -p %{buildroot}%{test_install_prefix}
diff --git a/scripts/command/tizen_xu4_test.sh b/scripts/command/tizen_xu4_test.sh
index d56dae2b5..38894df0f 100755
--- a/scripts/command/tizen_xu4_test.sh
+++ b/scripts/command/tizen_xu4_test.sh
@@ -131,17 +131,17 @@ fi
# run unittest
if [ "$UNITTEST" == "on" ]; then
- $SDB_CMD shell $TEST_ROOT/tools/test_driver/test_driver.sh --unittest --artifactpath=$TEST_ROOT
+ $SDB_CMD shell $TEST_ROOT/tests/scripts/test_driver.sh --unittest --artifactpath=$TEST_ROOT
fi
# run framework test
if [ "$FRAMEWORK" == "on" ]; then
- $SDB_CMD shell $TEST_ROOT/tools/test_driver/test_driver.sh --frameworktest --artifactpath=$TEST_ROOT
+ $SDB_CMD shell $TEST_ROOT/tests/scripts/test_driver.sh --frameworktest --artifactpath=$TEST_ROOT
fi
# run verification
if [ "$VERIFICATION" == "on" ]; then
- $SDB_CMD shell $TEST_ROOT/tools/test_driver/test_driver.sh --verification --artifactpath=$TEST_ROOT
+ $SDB_CMD shell $TEST_ROOT/tests/scripts/test_driver.sh --verification --artifactpath=$TEST_ROOT
fi
# pull gcov files
diff --git a/tools/test_driver/README.md b/tests/scripts/README.md
index 2981267a5..66a197d51 100644
--- a/tools/test_driver/README.md
+++ b/tests/scripts/README.md
@@ -7,7 +7,7 @@
- Related file : `run_unittest.sh`
- Usage :
```
-$ ./tools/test_driver/test_driver.sh \
+$ ./tests/scripts/test_driver.sh \
--artifactpath=. \
--unittest
```
@@ -15,7 +15,7 @@ $ ./tools/test_driver/test_driver.sh \
```
$ LD_LIBRARY_PATH=Product/out/lib \
- ./tools/test_driver/run_unittest.sh \
+ ./tests/scripts/run_unittest.sh \
--reportdir=report \
--unittestdir=Product/out/unittest
```
@@ -42,7 +42,7 @@ $ LD_LIBRARY_PATH=Product/out/lib \
- Driver source location : `tools/tflite_run/`
- Usage :
```
-$ ./tools/test_driver/test_driver.sh \
+$ ./tests/scripts/test_driver.sh \
--artifactpath=. \
--frameworktest
```
@@ -56,7 +56,7 @@ $ ./tools/test_driver/test_driver.sh \
- Driver source location : `tools/nnapi_test/`
- Usage :
```
-$ ./tools/test_driver/test_driver.sh \
+$ ./tests/scripts/test_driver.sh \
--artifactpath=. \
--verification .
```
diff --git a/tools/test_driver/common.sh b/tests/scripts/common.sh
index 12a35fd35..12a35fd35 100755
--- a/tools/test_driver/common.sh
+++ b/tests/scripts/common.sh
diff --git a/tools/test_driver/neurun_frameworktest_list.txt b/tests/scripts/neurun_frameworktest_list.txt
index 9c4e97dac..9c4e97dac 100644
--- a/tools/test_driver/neurun_frameworktest_list.txt
+++ b/tests/scripts/neurun_frameworktest_list.txt
diff --git a/tools/test_driver/nnfw_kernel_env_list.txt b/tests/scripts/nnfw_kernel_env_list.txt
index 9cb3fc46c..9cb3fc46c 100644
--- a/tools/test_driver/nnfw_kernel_env_list.txt
+++ b/tests/scripts/nnfw_kernel_env_list.txt
diff --git a/tools/test_driver/print_to_json.sh b/tests/scripts/print_to_json.sh
index a5ea5689b..a5ea5689b 100755
--- a/tools/test_driver/print_to_json.sh
+++ b/tests/scripts/print_to_json.sh
diff --git a/tools/test_driver/py/common.py b/tests/scripts/py/common.py
index 37b40e1ce..37b40e1ce 100755
--- a/tools/test_driver/py/common.py
+++ b/tests/scripts/py/common.py
diff --git a/tools/test_driver/py/run_frameworktest.py b/tests/scripts/py/run_frameworktest.py
index a4fbd075a..a4fbd075a 100755
--- a/tools/test_driver/py/run_frameworktest.py
+++ b/tests/scripts/py/run_frameworktest.py
diff --git a/tools/test_driver/py/run_unittest.py b/tests/scripts/py/run_unittest.py
index 2e2ad3434..2e2ad3434 100755
--- a/tools/test_driver/py/run_unittest.py
+++ b/tests/scripts/py/run_unittest.py
diff --git a/tools/test_driver/py/test_driver.py b/tests/scripts/py/test_driver.py
index 9ed97d202..f9c48e11f 100755
--- a/tools/test_driver/py/test_driver.py
+++ b/tests/scripts/py/test_driver.py
@@ -144,7 +144,7 @@ def get_parsed_options():
type=str,
dest="frameworktest_list_file",
help=
- "(default=ARTIFACT_PATH/tools/test_driver/pureacl_frameworktest_list.txt) filepath of model list for test"
+ "(default=ARTIFACT_PATH/tests/scripts/pureacl_frameworktest_list.txt) filepath of model list for test"
)
parser.add_argument(
"--reportdir",
@@ -177,7 +177,7 @@ def get_parsed_options():
def run_unittest(options):
- cmd = "{artifactpath}/tools/test_driver/run_unittest.sh \
+ cmd = "{artifactpath}/tests/scripts/run_unittest.sh \
--reportdir={reportdir} \
--unittestdir={unittestdir}".format(
artifactpath=options.artifactpath,
@@ -195,7 +195,7 @@ def run_frameworktest(options):
print("Cannot find {driverbin}".format(driverbin=options.framework_driverbin))
sys.exit(1)
- cmd = "{artifactpath}/tools/test_driver/run_frameworktest.sh \
+ cmd = "{artifactpath}/tests/scripts/run_frameworktest.sh \
--runtestsh={runtestsh} \
--driverbin={driverbin} \
--reportdir={reportdir} \
@@ -217,7 +217,7 @@ def run_verification(options):
driverbin=options.verification_driverbin))
sys.exit(1)
- cmd = "{artifactpath}/tools/test_driver/run_frameworktest.sh \
+ cmd = "{artifactpath}/tests/scripts/run_frameworktest.sh \
--runtestsh={runtestsh} \
--driverbin={driverbin} \
--reportdir={reportdir} \
@@ -238,7 +238,7 @@ def run_benchmark(options):
print("Cannot find {driverbin}".format(driverbin=options.benchmark_driverbin))
sys.exit(1)
- cmd = "{artifactpath}/tools/test_driver/run_benchmark.sh \
+ cmd = "{artifactpath}/tests/scripts/run_benchmark.sh \
--runtestsh={runtestsh} \
--driverbin={driverbin} \
--reportdir={reportdir}/benchmark".format(
@@ -256,7 +256,7 @@ def run_benchmarkop(options):
print("Cannot find {driverbin}".format(driverbin=options.benchmark_driverbin))
sys.exit(1)
- cmd = "{artifactpath}/tools/test_driver/run_benchmark_op.sh \
+ cmd = "{artifactpath}/tests/scripts/run_benchmark_op.sh \
--runtestsh={runtestsh} \
--driverbin={driverbin} \
--reportdir={reportdir}/benchmark_op \
@@ -271,7 +271,7 @@ def run_benchmarkop(options):
def run_benchmarkacl(options):
- cmd = "{artifactpath}/tools/test_driver/run_benchmark_acl.sh \
+ cmd = "{artifactpath}/tests/scripts/run_benchmark_acl.sh \
--reportdir={reportdir}/benchmark \
--bindir={artifactpath}/Product/out/bin".format(
reportdir=options.reportdir, artifactpath=options.artifactpath)
@@ -279,7 +279,7 @@ def run_benchmarkacl(options):
def make_json_for_benchmark_result(options):
- cmd = "source {artifactpath}/tools/test_driver/print_to_json.sh && ".format(
+ cmd = "source {artifactpath}/tests/scripts/print_to_json.sh && ".format(
artifactpath=options.artifactpath)
if options.benchmarkop_on:
cmd += "print_to_json {artifactpath}/report/benchmark_op \
diff --git a/tools/test_driver/run_benchmark.sh b/tests/scripts/run_benchmark.sh
index 6980475b6..6980475b6 100755
--- a/tools/test_driver/run_benchmark.sh
+++ b/tests/scripts/run_benchmark.sh
diff --git a/tools/test_driver/run_benchmark_acl.sh b/tests/scripts/run_benchmark_acl.sh
index c6a643baa..c6a643baa 100755
--- a/tools/test_driver/run_benchmark_acl.sh
+++ b/tests/scripts/run_benchmark_acl.sh
diff --git a/tools/test_driver/run_benchmark_op.sh b/tests/scripts/run_benchmark_op.sh
index 4b3467379..4b3467379 100755
--- a/tools/test_driver/run_benchmark_op.sh
+++ b/tests/scripts/run_benchmark_op.sh
diff --git a/tools/test_driver/run_benchmark_tflite_model.in b/tests/scripts/run_benchmark_tflite_model.in
index 1003ecc13..1003ecc13 100644
--- a/tools/test_driver/run_benchmark_tflite_model.in
+++ b/tests/scripts/run_benchmark_tflite_model.in
diff --git a/tools/test_driver/run_benchmark_tflite_model.sh b/tests/scripts/run_benchmark_tflite_model.sh
index 50a2a5fb3..50a2a5fb3 100755
--- a/tools/test_driver/run_benchmark_tflite_model.sh
+++ b/tests/scripts/run_benchmark_tflite_model.sh
diff --git a/tools/test_driver/run_frameworktest.sh b/tests/scripts/run_frameworktest.sh
index 343fd0292..343fd0292 100755
--- a/tools/test_driver/run_frameworktest.sh
+++ b/tests/scripts/run_frameworktest.sh
diff --git a/tools/test_driver/run_unittest.sh b/tests/scripts/run_unittest.sh
index 5eddfb32c..5eddfb32c 100755
--- a/tools/test_driver/run_unittest.sh
+++ b/tests/scripts/run_unittest.sh
diff --git a/tools/test_driver/test_driver.sh b/tests/scripts/test_driver.sh
index 30b5ea29c..30b5ea29c 100755
--- a/tools/test_driver/test_driver.sh
+++ b/tests/scripts/test_driver.sh
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 12:43:08 +0000