!11458 update ut run script of mindspore lite

From: @zhanghaibo5
Reviewed-by: @zhang_xue_tong
Signed-off-by:

mindspore/lite/test/run_benchmark_nets.sh

@@ -2,7 +2,7 @@
 
 # Run converter on x86 platform:
 function Run_Converter() {
-    # Unzip x86 runtime and convertor
+    # Unzip x86 runtime and converter
     cd ${x86_path} || exit 1
     tar -zxf mindspore-lite-${version}-inference-linux-x64.tar.gz || exit 1
     tar -zxf mindspore-lite-${version}-inference-linux-x64-sse.tar.gz || exit 1

mindspore/lite/test/run_inference_ut.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-cd ./ut/src/runtime/kernel/arm || exit 1
-../../../../../../build/test/lite-test --gtest_filter=ControlFlowTest.TestMergeWhileModel

mindspore/lite/test/run_test.sh

@@ -1,66 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-CUR_DIR=$(cd "$(dirname $0)"; pwd)
-BUILD_DIR=${CUR_DIR}/../build
-
-# prepare run directory for ut
-mkdir -pv ${CUR_DIR}/do_test
-
-# prepare data for ut
-cd ${CUR_DIR}/do_test
-cp ${BUILD_DIR}/test/lite-test ./
-cp -r ${CUR_DIR}/ut/src/runtime/kernel/arm/test_data/* ./
-cp -r ${CUR_DIR}/ut/tools/converter/parser/tflite/test_data/* ./
-# prepare data for dataset
-TEST_DATA_DIR=${CUR_DIR}/../../../tests/ut/data/dataset/
-cp -fr $TEST_DATA_DIR/testPK ./data
-
-# test cases of MindData
-./lite-test --gtest_filter="*MindDataTestTensorDE*"
-./lite-test --gtest_filter="*MindDataTestEager*"
-
-# test cases of Converter
-## ./lite-test --gtest_filter="TestTfliteParser*"
-
-# test cases with benchmark
-## ./lite-test --gtest_filter="*TestHebing*"
-
-# test cases of framework
-./lite-test --gtest_filter="ControlFlowTest.TestMergeWhileModel"
-
-# test cases of FP32 OP
-./lite-test --gtest_filter=TestFcFp32*
-./lite-test --gtest_filter=TestConv1x1Fp32*
-./lite-test --gtest_filter=TestStrassenFp32*
-## ./lite-test --gtest_filter=TestDeConvolutionFp32*
-
-# test cases of INT8 OP
-## ./lite-test --gtest_filter=TestPadInt8.*
-## ./lite-test --gtest_filter=TestDeconvInt8.*
-
-# test cases of GPU OpenCL
-./lite-test --gtest_filter="TestConvolutionOpenCL.simple_test*"
-./lite-test --gtest_filter="TestArithmeticSelfOpenCLCI.ArithmeticSelfRound*"
-./lite-test --gtest_filter="TestConcatOpenCLCI.ConcatFp32_2inputforCI*"
-./lite-test --gtest_filter="TestSliceOpenCLfp32.Slicefp32CI*"
-./lite-test --gtest_filter="TestBatchnormOpenCLCI.Batchnormfp32CI*"
-./lite-test --gtest_filter="TestAvgPoolingOpenCL*"
-./lite-test --gtest_filter="TestConv2dTransposeOpenCL*"
-./lite-test --gtest_filter="TestMatMulOpenCL*"
-./lite-test --gtest_filter="TestMaxPoolingOpenCL*"
-./lite-test --gtest_filter="TestReduceOpenCL*"
-./lite-test --gtest_filter="TestReshapeOpenCL*"
-./lite-test --gtest_filter="TestSoftmaxOpenCL*"
-./lite-test --gtest_filter="TestTransposeOpenCL*"
-./lite-test --gtest_filter="TestArithmeticOpenCL*"
-./lite-test --gtest_filter="TestScaleOpenCL*"
-./lite-test --gtest_filter="TestFullConnectionOpenCL*"
-./lite-test --gtest_filter="TestResizeOpenCL*"
-./lite-test --gtest_filter="TestSwishOpenCLCI.Fp32CI"
-
-# test cases of train
-./lite-test --gtest_filter="NetworkTest.efficient_net"
-## ./lite-test --gtest_filter="NetworkTest.tuning_layer"
-## ./lite-test --gtest_filter="NetworkTest.lenetnet"
-

mindspore/lite/test/run_train_ut.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-cd ./ut/src/runtime/kernel/arm || exit 1
-../../../../../../build/test/lite-test --gtest_filter=NetworkTest.efficient_net
-# ../../../../../../build/test/lite-test --gtest_filter=NetworkTest.tuning_layer
-# ../../../../../../build/test/lite-test --gtest_filter=NetworkTest.lenetnet

mindspore/lite/test/runtest.sh

@@ -1,14 +1,73 @@
 #!/bin/bash
+
 set -e
+CUR_DIR=$(cd "$(dirname $0)"; pwd)
+BUILD_DIR=${CUR_DIR}/../build
+
+# prepare run directory for ut
+mkdir -pv ${CUR_DIR}/do_test
+
+# prepare data for ut
+cd ${CUR_DIR}/do_test
+cp ${BUILD_DIR}/test/lite-test ./
+cp -r ${CUR_DIR}/ut/src/runtime/kernel/arm/test_data/* ./
+cp -r ${CUR_DIR}/ut/tools/converter/parser/tflite/test_data/* ./
+# prepare data for dataset
+TEST_DATA_DIR=${CUR_DIR}/../../../tests/ut/data/dataset/
+cp -fr $TEST_DATA_DIR/testPK ./data
+
+echo 'run common ut tests'
+# test cases of MindData
+./lite-test --gtest_filter="*MindDataTestTensorDE*"
+./lite-test --gtest_filter="*MindDataTestEager*"
+
+# test cases of Converter
+## ./lite-test --gtest_filter="TestTfliteParser*"
+
+# test cases with benchmark
+## ./lite-test --gtest_filter="*TestHebing*"
+
+# test cases of framework
+
+# test cases of FP32 OP
+./lite-test --gtest_filter=TestFcFp32*
+./lite-test --gtest_filter=TestConv1x1Fp32*
+./lite-test --gtest_filter=TestStrassenFp32*
+## ./lite-test --gtest_filter=TestDeConvolutionFp32*
+
+# test cases of INT8 OP
+## ./lite-test --gtest_filter=TestPadInt8.*
+## ./lite-test --gtest_filter=TestDeconvInt8.*
+
+# test cases of GPU OpenCL
+./lite-test --gtest_filter="TestConvolutionOpenCL.simple_test*"
+./lite-test --gtest_filter="TestArithmeticSelfOpenCLCI.ArithmeticSelfRound*"
+./lite-test --gtest_filter="TestConcatOpenCLCI.ConcatFp32_2inputforCI*"
+./lite-test --gtest_filter="TestSliceOpenCLfp32.Slicefp32CI*"
+./lite-test --gtest_filter="TestBatchnormOpenCLCI.Batchnormfp32CI*"
+./lite-test --gtest_filter="TestAvgPoolingOpenCL*"
+./lite-test --gtest_filter="TestConv2dTransposeOpenCL*"
+./lite-test --gtest_filter="TestMatMulOpenCL*"
+./lite-test --gtest_filter="TestMaxPoolingOpenCL*"
+./lite-test --gtest_filter="TestReduceOpenCL*"
+./lite-test --gtest_filter="TestReshapeOpenCL*"
+./lite-test --gtest_filter="TestSoftmaxOpenCL*"
+./lite-test --gtest_filter="TestTransposeOpenCL*"
+./lite-test --gtest_filter="TestArithmeticOpenCL*"
+./lite-test --gtest_filter="TestScaleOpenCL*"
+./lite-test --gtest_filter="TestFullConnectionOpenCL*"
+./lite-test --gtest_filter="TestResizeOpenCL*"
+./lite-test --gtest_filter="TestSwishOpenCLCI.Fp32CI"
 
-CURRPATH=$(cd "$(dirname $0)"; pwd) 
-cd ${CURRPATH}
-if [ $1 == train ]; then
+# test cases specific for train
+if [[ $1 == train ]]; then
     echo 'run train ut tests'
-    bash run_train_ut.sh
+    ## ./lite-test --gtest_filter=NetworkTest.efficient_net
+    ## ./lite-test --gtest_filter="NetworkTest.tuning_layer"
+    ## ./lite-test --gtest_filter="NetworkTest.lenetnet"
 fi
 
-if [ $1 == inference ]; then
+if [[ $1 == inference ]]; then
     echo 'run inference ut tests'
-    bash run_inference_ut.sh
+    ./lite-test --gtest_filter="ControlFlowTest.TestMergeWhileModel"
 fi