From b3c308797542899076cf24be1452cd933b569fa6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=98=A4=ED=98=95=EC=84=9D/On-Device=20Lab=28SR=29/Staff?= =?utf8?q?=20Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Wed, 2 Jan 2019 19:24:18 +0900 Subject: [PATCH] Remove workaround for test script path change (#4134) Remove workaround for test script path change because CI scripts are updated Signed-off-by: Hyeongseok Oh --- Makefile | 12 +++--------- tests/scripts/test_driver.sh | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 2d2f96e..430a43e 100644 --- a/Makefile +++ b/Makefile @@ -214,15 +214,12 @@ test_internal_cross: @echo "Can't do tests on cross build" test_internal: - tools/test_driver/test_driver.sh . + tests/scripts/test_driver.sh . 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/scripts tests/framework tools/test_driver $(INSTALL_ALIAS) --dereference - @rm -rf tools/test_driver + @tar -zcf test-suite.tar.gz tests/scripts tests/framework $(INSTALL_ALIAS) --dereference @mv test-suite.tar.gz $(INSTALL_ROOT)/. build_coverage_suite: install_internal @@ -230,10 +227,7 @@ build_coverage_suite: install_internal @rm -rf $(INSTALL_ROOT)/coverage-suite.tar.gz @find Product -name "*.gcno" > include_lists.txt @pwd | grep -o '/' | wc -l > tests/scripts/build_path_depth.txt -# Workaround for CI test: copy test script to old directory path - @cp -rf tests/scripts tools/test_driver - @tar -zcf coverage-suite.tar.gz tests/scripts tests/framework tools/test_driver $(INSTALL_ALIAS) --dereference -T include_lists.txt - @rm -rf tools/test_driver + @tar -zcf coverage-suite.tar.gz tests/scripts tests/framework $(INSTALL_ALIAS) --dereference -T include_lists.txt @rm -rf include_lists.txt tests/scripts/build_path_depth.txt @mv coverage-suite.tar.gz $(INSTALL_ROOT)/. diff --git a/tests/scripts/test_driver.sh b/tests/scripts/test_driver.sh index 30b5ea2..97a3dab 100755 --- a/tests/scripts/test_driver.sh +++ b/tests/scripts/test_driver.sh @@ -295,7 +295,7 @@ fi # Make json file. Actually, this process is only needed on CI. That's why it is in test_driver.sh. if [ "$BENCHMARK_ON" == "true" ] || [ "$BENCHMARK_ACL_ON" == "true" ] || [ "$BENCHMARK_OP_ON" == "true" ]; then # functions to fill json with benchmark results - source $ARTIFACT_PATH/tools/test_driver/print_to_json.sh + source $ARTIFACT_PATH/tests/scripts/print_to_json.sh if [ "$BENCHMARK_OP_ON" == "true" ]; then print_to_json $REPORT_DIR/benchmark_op $REPORT_DIR "benchmark_op_result.json" else -- 2.7.4