From 83499884ae28a0df22439cbda4ae5099abb2f347 Mon Sep 17 00:00:00 2001
From: ervinzhang <yizhi.zhang@huawei.com>
Date: Tue, 4 Aug 2020 11:31:08 -0400
Subject: [PATCH] adapted test for x86 build

---
 mindspore/lite/src/CMakeLists.txt                    | 5 ++++-
 mindspore/lite/test/CMakeLists.txt                   | 4 +++-
 mindspore/lite/test/run_test.sh                      | 6 ++++++
 mindspore/lite/test/ut/src/dataset/de_tensor_test.cc | 6 +-----
 mindspore/lite/test/ut/src/dataset/eager_test.cc     | 4 ++++
 5 files changed, 18 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 mindspore/lite/test/run_test.sh

diff --git a/mindspore/lite/src/CMakeLists.txt b/mindspore/lite/src/CMakeLists.txt
index 438e3da63..c41ad846e 100644
--- a/mindspore/lite/src/CMakeLists.txt
+++ b/mindspore/lite/src/CMakeLists.txt
@@ -81,7 +81,10 @@ target_link_libraries(mindspore-lite
 
 add_subdirectory(runtime/kernel/arm)
 if (BUILD_MINDDATA)
-        target_link_libraries(mindspore-lite minddata-eager minddata-lite log)
+        target_link_libraries(mindspore-lite minddata-eager minddata-lite)
+        if (PLATFORM_ARM32 OR PLATFORM_ARM64)
+           target_link_libraries(mindspore-lite log)
+        endif()
 endif ()
 
 add_subdirectory(ops)
diff --git a/mindspore/lite/test/CMakeLists.txt b/mindspore/lite/test/CMakeLists.txt
index b17c5662a..a5d46bad2 100644
--- a/mindspore/lite/test/CMakeLists.txt
+++ b/mindspore/lite/test/CMakeLists.txt
@@ -298,8 +298,10 @@ if (BUILD_MINDDATA)
     target_link_libraries(lite-test
            minddata-lite
            minddata-eager
-           log
            )
+    if (PLATFORM_ARM32 OR PLATFORM_ARM64)
+           target_link_libraries(lite-test log)
+    endif()
 endif()
 if (BUILD_CONVERTER)
     target_link_libraries(lite-test
diff --git a/mindspore/lite/test/run_test.sh b/mindspore/lite/test/run_test.sh
old mode 100644
new mode 100755
index 738df29b9..be4073bc2
--- a/mindspore/lite/test/run_test.sh
+++ b/mindspore/lite/test/run_test.sh
@@ -7,6 +7,12 @@ mkdir -pv ${CUR_DIR}/do_test
 cd ${CUR_DIR}/do_test
 cp ${BUILD_DIR}/test/lite-test ./
 cp -r ${CUR_DIR}/ut/src/runtime/kernel/arm/test_data/* ./
+## prepare data for dataset
+TEST_DATA_DIR=${CUR_DIR}/../../../tests/ut/data/dataset/
+cp -fr $TEST_DATA_DIR/testPK ./data
+
+./lite-test --gtest_filter="*MindDataTestTensorDE*"
+./lite-test --gtest_filter="*MindDataTestEager*"
 
 ./lite-test --gtest_filter="*TestHebing*"
 
diff --git a/mindspore/lite/test/ut/src/dataset/de_tensor_test.cc b/mindspore/lite/test/ut/src/dataset/de_tensor_test.cc
index 13120405e..0a497a65a 100644
--- a/mindspore/lite/test/ut/src/dataset/de_tensor_test.cc
+++ b/mindspore/lite/test/ut/src/dataset/de_tensor_test.cc
@@ -90,9 +90,5 @@ TEST_F(MindDataTestTensorDE, MSTensorHash) {
   std::shared_ptr<Tensor> t;
   Tensor::CreateFromVector(x, TensorShape({2, 2}), &t);
   auto ms_tensor = std::shared_ptr<mindspore::tensor::MSTensor>(new mindspore::tensor::DETensor(t));
-#ifdef ENABLE_ARM64
-  ASSERT_EQ(ms_tensor->hash() == 11093771382437, true); // arm64
-#else
-  ASSERT_EQ(ms_tensor->hash() == 11093825635904, true);
-#endif
+  ASSERT_EQ(ms_tensor->hash() == 11093771382437, true);
 }
\ No newline at end of file
diff --git a/mindspore/lite/test/ut/src/dataset/eager_test.cc b/mindspore/lite/test/ut/src/dataset/eager_test.cc
index 6cacfffdf..3a36a5194 100644
--- a/mindspore/lite/test/ut/src/dataset/eager_test.cc
+++ b/mindspore/lite/test/ut/src/dataset/eager_test.cc
@@ -33,7 +33,11 @@ class MindDataTestEager : public mindspore::Common {
 };
 
 TEST_F(MindDataTestEager, Test1) {
+#ifdef ENABLE_ARM64 || ENABLE_ARM32
   std::string in_dir = "/sdcard/data/testPK/data/class1";
+#else
+  std::string in_dir = "data/testPK/data/class1";
+#endif
   Path base_dir = Path(in_dir);
   MS_LOG(WARNING) << base_dir.toString() << ".";
   if (!base_dir.IsDirectory() || !base_dir.Exists()) {
-- 
GitLab