From 655d7f5bc51a436f2e165e08007318e81a9d32b3 Mon Sep 17 00:00:00 2001
From: hwb0703 <hanweibin1@huawei.com>
Date: Fri, 2 Apr 2021 11:05:03 +0800
Subject: [PATCH] modify the path of the compiled script

---
 config/user_config.xml            | 18 +++++++++++++++++-
 src/core/build/build_testcases.py |  2 +-
 src/core/common.py                |  4 +++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/config/user_config.xml b/config/user_config.xml
index 763c1a6..dcbebb0 100755
--- a/config/user_config.xml
+++ b/config/user_config.xml
@@ -15,30 +15,43 @@
 -->
 <user_config>
   <common>
+    <!-- reserved field to distinguish device form -->
     <doublefwk>false</doublefwk>
   </common>
   <build>
+    <!-- whether compile test demo case, default false -->
     <example>false</example>
+    <!-- whether compile test version, default false -->
     <version>false</version>
+    <!-- whether compile test case, default false -->
     <testcase>false</testcase>
     <paramter>
+      <!-- reserved field, os name -->
       <target_os>ohos</target_os>
+      <!-- reserved field, cpu type -->
       <target_cpu>arm64</target_cpu>
-      <variant>release</variant>
+      <!-- reserved field, version type, default debug -->
+      <variant>debug</variant>
     </paramter>
     <board_info>
+      <!-- board series, default hispark -->
       <board_series>hispark</board_series>
+      <!-- board type, default taurus(3516dv300), aries(3518ev300), pegasus(3861) -->
       <board_type>taurus</board_type>
+      <!-- product name, default ipcamera(3516dv300/3518ev300), wifiiot(3861) -->
       <board_product>ipcamera</board_product>
+      <!-- build command, default hb build -->
       <build_command>hb build</build_command>
     </board_info>
   </build>
   <environment>
+    <!-- reserved field, configure devices that support HDC connection -->
     <device type="usb-hdc">
       <ip></ip>
       <port></port>
       <sn></sn>
     </device>
+    <!-- configure devices that support serial connection -->
     <device type="com"
             label="ipcamera">
       <serial>
@@ -51,12 +64,15 @@
       </serial>
     </device>
   </environment>
+  <!-- configure test cases path -->
   <test_cases>
     <dir></dir>
   </test_cases>
+  <!-- reserved field, configure output path for coverage -->
   <coverage>
     <outpath></outpath>
   </coverage>
+  <!-- configure NFS mount path for test cases -->
   <NFS>
     <host_dir></host_dir>
     <board_dir></board_dir>
diff --git a/src/core/build/build_testcases.py b/src/core/build/build_testcases.py
index 7c9fd9e..3582883 100755
--- a/src/core/build/build_testcases.py
+++ b/src/core/build/build_testcases.py
@@ -25,7 +25,7 @@ from xdevice import platform_logger
 from core.utils import get_build_output_path
 from core.config.config_manager import UserConfigManager
 
-BUILD_FILEPATH = "build/gn/build_ohos.sh"
+BUILD_FILEPATH = "build/build_scripts/build_ohos.sh"
 BUILD_LITE_FILE = "build/lite/build.py"
 LOG = platform_logger("BuildTestcases")
 
diff --git a/src/core/common.py b/src/core/common.py
index 92b2ed1..cf2636e 100755
--- a/src/core/common.py
+++ b/src/core/common.py
@@ -22,7 +22,9 @@ __all__ = ["get_source_code_root_path"]
 
 
 def is_source_code_root_path(path):
-    check_name_list = ["build/gn/build_ohos.sh", "build", "prebuilts"]
+    check_name_list = ["build/build_scripts/build_ohos.sh",
+                       "build",
+                       "prebuilts"]
     for item in check_name_list:
         check_path = os.path.join(path, item)
         if os.path.exists(check_path):
-- 
Gitee