From ef3e3c89d05d300754034f355cdf12d36ff4f49c Mon Sep 17 00:00:00 2001
From: =?utf8?q?=EC=9D=B4=EC=83=81=EA=B7=9C/On-Device=20Lab=28SR=29/Princip?=
 =?utf8?q?al=20Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?=
 <sg5.lee@samsung.com>
Date: Mon, 28 Oct 2019 09:55:12 +0900
Subject: [PATCH] [nnpkg_test] nnpkg_test list accepts wildcard (#8486)

- You can use * in list.
- nnpkg_test list is updated.

Signed-off-by: Sanggyu Lee <sg5.lee@samsung.com>
---
 infra/scripts/test_arm_nnpkg.sh      |  8 ++++---
 tools/nnpackage_tool/nnpkg_test/list | 43 +++++++++---------------------------
 2 files changed, 16 insertions(+), 35 deletions(-)

diff --git a/infra/scripts/test_arm_nnpkg.sh b/infra/scripts/test_arm_nnpkg.sh
index af6b229..0be4140 100755
--- a/infra/scripts/test_arm_nnpkg.sh
+++ b/infra/scripts/test_arm_nnpkg.sh
@@ -11,9 +11,11 @@ EXITCODE=0
 PKG_LIST=$(cat tools/nnpackage_tool/nnpkg_test/list)
 for f in ${PKG_LIST}
 do
-  if [ -e "nnpkg-tcs/$f" ]; then
-    tools/nnpackage_tool/nnpkg_test/nnpkg_test.sh -d -i nnpkg-tcs $f
-  fi
+  for entry in "nnpkg-tcs"/$f; do
+    if [ -e $entry ]; then
+      tools/nnpackage_tool/nnpkg_test/nnpkg_test.sh -d -i nnpkg-tcs $(basename "$entry")
+    fi
+  done
   EXITCODE_F=$?
 
   if [ ${EXITCODE_F} -ne 0 ]; then
diff --git a/tools/nnpackage_tool/nnpkg_test/list b/tools/nnpackage_tool/nnpkg_test/list
index 6f9423a..c847160 100644
--- a/tools/nnpackage_tool/nnpkg_test/list
+++ b/tools/nnpackage_tool/nnpkg_test/list
@@ -1,43 +1,22 @@
-UNIT_Add_000
-UNIT_Add_001
-UNIT_Add_002
-UNIT_Add_004
-UNIT_Add_005
-UNIT_AvgPool_000
-UNIT_AvgPool_001
-UNIT_BiasAdd_000
-UNIT_BiasAdd_001
-UNIT_BiasAdd_002
-UNIT_ConcatV2_000
-UNIT_ConcatV2_001
-UNIT_ConcatV2_002
+UNIT_Add_*
+UNIT_AvgPool_*
+UNIT_BiasAdd_*
+UNIT_ConcatV2_*
 UNIT_Conv2D_000
 UNIT_Conv2DBackpropInput_000
 UNIT_Conv2DBackpropInput_001
-UNIT_DepthwiseConv2dNative_000
-UNIT_DepthwiseConv2dNative_001
-UNIT_MaxPool_000
-UNIT_MaxPool_001
-UNIT_Mean_000
-UNIT_Mean_001
-UNIT_Mean_002
-UNIT_Mean_003
-UNIT_Mul_000
-UNIT_Mul_001
-UNIT_Mul_002
+UNIT_DepthwiseConv2dNative_*
+UNIT_MaxPool_*
+UNIT_Mean_*
+UNIT_Mul_*
 UNIT_Pad_000
-UNIT_RealDiv_000
-UNIT_RealDiv_001
+UNIT_RealDiv_*
 UNIT_Relu_000
 UNIT_Relu6_000
 UNIT_Reshape_000
 UNIT_Rsqrt_000
 UNIT_Softmax_001
 UNIT_Sqrt_000
-UNIT_Squeeze_000
-UNIT_Squeeze_001
-UNIT_Squeeze_002
-UNIT_Squeeze_003
-UNIT_Sub_000
-UNIT_Sub_001
+UNIT_Squeeze_*
+UNIT_Sub_*
 UNIT_Tanh_000
-- 
2.7.4