Imported Upstream version 1.8.0

[platform/core/ml/nnfw.git] / infra / scripts / common.sh

diff --git a/infra/scripts/common.sh b/infra/scripts/common.sh
index 28aa213..a10aac2 100755 (executable)
--- a/infra/scripts/common.sh
+++ b/infra/scripts/common.sh
@@ -15,15 +15,18 @@
 # TFLiteModelVerification $1 $2 $3
 #   Run ./tests/scripts/test-driver.sh script verification test
 #
-# Unittests $1 $2 $3
-#   Run ./tests/scripts/test-driver.sh script unittest
+# NNAPIGTest $1 $2 $3
+#   Run [INSTALL_PATH]/test/onert-test unittest command for nnapi gtest
 #
 # NNPackageTest $1 $2
-#   Run ./tests/scripts/nnpkg_test.sh script nnpackage test
+#   Run [INSTALL_PATH]/test/onert-test nnpkg-test command
 
 CURRENT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 ROOT_PATH="$(cd ${CURRENT_PATH}/../../ && pwd)"
 
+# Install path on CI
+INSTALL_PATH=$ROOT_PATH/Product/out
+
 function CheckTestPrepared()
 {
   # Model download server setting
@@ -47,16 +50,12 @@ function TFLiteModelVerification()
 
   export BACKENDS=$1
   if [[ "$2" == "" ]]; then
-    ./tests/scripts/test-driver.sh \
-      --reportdir=$ROOT_PATH/$3 \
-      --verification \
-      .
+    $INSTALL_PATH/test/onert-test verify-tflite --api=nnapi \
+      --reportdir=$ROOT_PATH/$3
   else
-    ./tests/scripts/test-driver.sh \
-      --frameworktest_list_file=$2 \
-      --reportdir=$ROOT_PATH/$3 \
-      --verification \
-      .
+    $INSTALL_PATH/test/onert-test verify-tflite --api=nnapi \
+      --list=$2 \
+      --reportdir=$ROOT_PATH/$3
   fi
   unset BACKENDS
 
@@ -64,10 +63,10 @@ function TFLiteModelVerification()
 }
 
 # $1: (required) backend
-# $2: (required) unittest skiplist file relative path from nnfw root directory
+# $2: (required) nnapi gtest skiplist file relative path from nnfw root directory
 #                pass empty string if there is no test list
 # $3: (required) relative path for report from nnfw root directory
-function Unittests()
+function NNAPIGTest()
 {
   [[ $# -ne 3 ]] && echo "Invalid function argument setting" && exit 1
 
@@ -75,7 +74,7 @@ function Unittests()
 
   # Backup original nnapi_gtest.skip
   # TODO Pass skiplist to test-driver.sh
-  SKIPLIST_FILE="${ROOT_PATH}/Product/out/unittest/nnapi_gtest.skip"
+  SKIPLIST_FILE="${INSTALL_PATH}/unittest/nnapi_gtest.skip"
   BACKUP_FILE="${SKIPLIST_FILE}.backup"
   if [[ "$2" != "" ]]; then
     cp ${SKIPLIST_FILE} ${BACKUP_FILE}
@@ -83,10 +82,9 @@ function Unittests()
   fi
 
   export BACKENDS=$1
-  ./tests/scripts/test-driver.sh \
+  $INSTALL_PATH/test/onert-test unittest \
     --reportdir=$ROOT_PATH/$3 \
-    --unittest \
-    .
+    --unittestdir=$INSTALL_PATH/unittest
   unset BACKENDS
 
   # TODO Pass skiplist to test-driver.sh
@@ -115,7 +113,7 @@ function NNPackageTest()
   do
     for entry in "nnpkg-tcs"/$f; do
       if [ -e $entry ]; then
-        BACKENDS="$1" tests/scripts/nnpkg_test.sh -d -i nnpkg-tcs $(basename "$entry")
+        BACKENDS="$1" $INSTALL_PATH/test/onert-test nnpkg-test -d -i nnpkg-tcs $(basename "$entry")
       fi
     done
     EXITCODE_F=$?
@@ -144,16 +142,11 @@ function TFLiteLoaderTest()
 
   export BACKENDS=$1
   if [[ "$2" == "" ]]; then
-    ./tests/scripts/test-driver.sh \
-      --frameworktest \
-      --framework_driverbin="$ROOT_PATH/Product/out/bin/tflite_loader_test_tool" \
+    $INSTALL_PATH/test/onert-test verify-tflite --api=loader \
       --reportdir=$ROOT_PATH/$3
-      .
   else
-    ./tests/scripts/test-driver.sh \
-      --frameworktest \
-      --framework_driverbin="$ROOT_PATH/Product/out/bin/tflite_loader_test_tool" \
-      --frameworktest_list_file=tests/scripts/list/tflite_loader_list.${TEST_ARCH}.txt \
+    $INSTALL_PATH/test/onert-test verify-tflite --api=loader \
+      --list=$2 \
       --reportdir=$ROOT_PATH/$3
   fi
   unset BACKENDS