From 0df77daa190faf7fb8f828377907d6afabc6326d Mon Sep 17 00:00:00 2001
From: hwb0703 <hanweibin1@huawei.com>
Date: Mon, 22 Mar 2021 16:35:09 +0800
Subject: [PATCH 1/2] delete unused code and modify build command for test case

---
 config/framework_config.xml          | 11 +++--------
 config/user_config.xml               | 10 ++++++++--
 src/core/build/build_lite_manager.py | 27 ++++++++++-----------------
 src/core/build/build_testcases.py    | 26 +++++++++++++++++++++++++-
 src/core/command/display.py          |  9 +++++++--
 src/core/command/run.py              | 13 ++++++++-----
 src/core/common.py                   |  6 +++---
 src/core/utils.py                    | 24 ++++++++++++++++--------
 8 files changed, 80 insertions(+), 46 deletions(-)

diff --git a/config/framework_config.xml b/config/framework_config.xml
index 831d5c9..041b510 100755
--- a/config/framework_config.xml
+++ b/config/framework_config.xml
@@ -15,14 +15,9 @@
 -->
 <framework_config>
   <productform>
-    <option name="phone" />
-    <option name="ivi" />
-    <option name="wearable" />
-    <option name="intellitv" />
-    <option name="ipcamera|hi3518ev300|liteos_a" />
-    <option name="ipcamera|hi3518ev300|linux" />
-    <option name="ipcamera|hi3516dv300|liteos_a" />
-    <option name="ipcamera|hi3516dv300|linux" />
+    <option name="ipcamera_hispark_aries" />
+    <option name="ipcamera_hispark_taurus" />
+    <option name="wifiiot_hispark_pegasus" />
   </productform>
   <test_category>
     <option name="UT"
diff --git a/config/user_config.xml b/config/user_config.xml
index c3f8a73..929d798 100755
--- a/config/user_config.xml
+++ b/config/user_config.xml
@@ -15,17 +15,23 @@
 -->
 <user_config>
   <common>
-    <doublefwk>true</doublefwk>
+    <doublefwk>false</doublefwk>
   </common>
   <build>
     <example>false</example>
     <version>false</version>
     <testcase>true</testcase>
     <paramter>
-      <target_os>aosp</target_os>
+      <target_os>ohos</target_os>
       <target_cpu>arm64</target_cpu>
       <variant>release</variant>
     </paramter>
+    <board_info>
+      <board_series>hispark</board_series>
+      <board_type>taurus</board_type>
+      <board_product>ipcamera</board_product>
+      <build_command>hb build</build_command>
+    </board_info>
   </build>
   <environment>
     <device type="usb-hdc">
diff --git a/src/core/build/build_lite_manager.py b/src/core/build/build_lite_manager.py
index 479b22b..53758e7 100755
--- a/src/core/build/build_lite_manager.py
+++ b/src/core/build/build_lite_manager.py
@@ -33,25 +33,19 @@ class BuildLiteManager(object):
     log = platform_logger("BuildLiteManager")
 
     def __init__(self):
-        self.product_type = ""
-        self.platform = ""
-        self.kernel_type = ""
-
-    def _parse_build_param(self, param_option):
-        if param_option is None or "|" not in param_option.productform:
-            return False
-        if "|" in param_option.productform:
-            self.product_type, self.platform, self.kernel_type = \
-                param_option.productform.split("|")
-        return True
+        self.board_series = ""
+        self.board_type = ""
+        self.board_product = ""
 
     def build_version_and_cases(self):
-        build_command = "python build/lite/ compile %s --platform " \
-                        "%s_%s --test c  -b release" % (self.product_type,
-                                                        self.platform,
-                                                        self.kernel_type)
+        build_command = "hb build -b debug"
         self.log.info("build param:%s" % build_command)
-        return subprocess.call(build_command) == 0
+        build_result = False
+        try:
+            build_result = subprocess.call(build_command) == 0
+        except IOError as exception:
+            self.log.error("build test case failed, exception=%s" % exception)
+        return build_result
 
     def exec_build_test(self, param_option):
         """
@@ -59,7 +53,6 @@ class BuildLiteManager(object):
         :param param_option: build param
         :return:build success or failed
         """
-        self._parse_build_param(param_option)
         if platform.system() == "Linux":
             return self.build_version_and_cases()
         self.log.info("windows environment, only use .bin test cases")
diff --git a/src/core/build/build_testcases.py b/src/core/build/build_testcases.py
index e14f08c..7c9fd9e 100755
--- a/src/core/build/build_testcases.py
+++ b/src/core/build/build_testcases.py
@@ -26,6 +26,7 @@ from core.utils import get_build_output_path
 from core.config.config_manager import UserConfigManager
 
 BUILD_FILEPATH = "build/gn/build_ohos.sh"
+BUILD_LITE_FILE = "build/lite/build.py"
 LOG = platform_logger("BuildTestcases")
 
 
@@ -150,11 +151,34 @@ class BuildTestcases(object):
             else:
                 build_result = False
         else:
-            LOG.warning("Error: The %s is not exist" % BUILD_FILEPATH)
+            if not self.is_doublefwk:
+                build_result = self._execute_build_lite_command()
+            else:
+                LOG.warning("Error: The %s is not exist" % BUILD_FILEPATH)
 
         os.chdir(current_path)
         return build_result
 
+    def _execute_build_lite_command(self):
+        if os.path.exists(BUILD_LITE_FILE):
+            temp_user_manager = UserConfigManager()
+            build_command_config = \
+                temp_user_manager.get_user_config("build", "board_info")
+            build_command = [build_command_config.get("build_command", "")]
+            LOG.info("build_command: %s" % str(build_command))
+            try:
+                if subprocess.call(build_command) == 0:
+                    LOG.info("execute build lite command success")
+                    return True
+                else:
+                    LOG.error("execute build lite command failed")
+            except IOError as exception:
+                LOG.error("build lite test case failed, exception=%s"
+                          % exception)
+        else:
+            LOG.warning("Error: The %s is not exist" % BUILD_LITE_FILE)
+        return True
+
     def build_testcases(self, productform, target):
         command = []
 
diff --git a/src/core/command/display.py b/src/core/command/display.py
index 43adeaa..399ab78 100755
--- a/src/core/command/display.py
+++ b/src/core/command/display.py
@@ -216,8 +216,13 @@ def display_show_info(para_list, productform):
 
 def get_module_list_from_output_dir():
     module_path_list = []
-    module_list_file_path = os.path.join(get_build_output_path(),
-                                         "module_list_files")
+    if UserConfigManager().get_user_config_flag("common", "doublefwk"):
+        module_list_file_path = os.path.join(get_build_output_path(),
+                                             "module_list_files")
+    else:
+        module_list_file_path = os.path.join(get_build_output_path(),
+                                             "test_info",
+                                             "module_list_files")    
     print(module_list_file_path)
     if os.path.exists(module_list_file_path):
         file_list = get_file_list_by_postfix(module_list_file_path, ".mlf")
diff --git a/src/core/command/run.py b/src/core/command/run.py
index 5f945a5..f67358b 100755
--- a/src/core/command/run.py
+++ b/src/core/command/run.py
@@ -178,11 +178,14 @@ class Run(object):
     def get_tests_out_path(cls, product_form):
         tests_out_path = UserConfigManager().get_test_cases_dir()
         if tests_out_path == "":
-            tests_out_path = os.path.abspath(os.path.join(
-                get_build_output_path(),
-                "packages",
-                product_form,
-                "tests"))
+            if UserConfigManager().get_user_config_flag("common", "doublefwk"):
+                tests_out_path = os.path.abspath(os.path.join(
+                    get_build_output_path(),
+                    "packages",
+                    product_form,
+                    "tests"))
+            else:
+                tests_out_path = os.path.join(get_build_output_path(), "test")
         return tests_out_path
 
     @classmethod
diff --git a/src/core/common.py b/src/core/common.py
index 0b54804..92b2ed1 100755
--- a/src/core/common.py
+++ b/src/core/common.py
@@ -25,9 +25,9 @@ def is_source_code_root_path(path):
     check_name_list = ["build/gn/build_ohos.sh", "build", "prebuilts"]
     for item in check_name_list:
         check_path = os.path.join(path, item)
-        if not os.path.exists(check_path):
-            return False
-    return True
+        if os.path.exists(check_path):
+            return True
+    return False
 
 
 def get_source_code_root_path(path):
diff --git a/src/core/utils.py b/src/core/utils.py
index 6ab4220..8dbdf9e 100755
--- a/src/core/utils.py
+++ b/src/core/utils.py
@@ -75,14 +75,22 @@ def get_build_output_path():
         return ""
 
     manager = UserConfigManager()
-    para_dic = manager.get_user_config("build", "paramter")
-
-    target_os = para_dic.get("target_os", "")
-    target_cpu = para_dic.get("target_cpu", "")
-    variant = para_dic.get("variant", "")
-    build_output_name = "%s-%s-%s" % (target_os, target_cpu, variant)
-    if build_output_name == "aosp-arm64-release":
-        build_output_name = "release"
+    if manager.get_user_config_flag("common", "doublefwk"):
+        para_dic = manager.get_user_config("build", "paramter")
+        target_os = para_dic.get("target_os", "")
+        target_cpu = para_dic.get("target_cpu", "")
+        variant = para_dic.get("variant", "")
+        build_output_name = "%s-%s-%s" % (target_os, target_cpu, variant)
+        if build_output_name == "ohos-arm64-release":
+            build_output_name = "release"
+    else:
+        para_dic = manager.get_user_config("build", "board_info")
+        board_series = para_dic.get("board_series", "")
+        board_type = para_dic.get("board_type", "")
+        board_product = para_dic.get("board_product", "")
+        first_build_output = "%s_%s" % (board_series, board_type)
+        second_build_output = "%s_%s" % (board_product, first_build_output)
+        build_output_name = os.path.join(first_build_output, second_build_output)
 
     build_output_path = os.path.join(
         sys.source_code_root_path,
-- 
Gitee


From 357be42cc54067bb4a3b6da14e2742e386895007 Mon Sep 17 00:00:00 2001
From: hwb0703 <hanweibin1@huawei.com>
Date: Mon, 22 Mar 2021 19:30:56 +0800
Subject: [PATCH 2/2] modify coding check style

---
 config/user_config.xml | 2 +-
 src/core/utils.py      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/user_config.xml b/config/user_config.xml
index 929d798..763c1a6 100755
--- a/config/user_config.xml
+++ b/config/user_config.xml
@@ -20,7 +20,7 @@
   <build>
     <example>false</example>
     <version>false</version>
-    <testcase>true</testcase>
+    <testcase>false</testcase>
     <paramter>
       <target_os>ohos</target_os>
       <target_cpu>arm64</target_cpu>
diff --git a/src/core/utils.py b/src/core/utils.py
index 8dbdf9e..5273649 100755
--- a/src/core/utils.py
+++ b/src/core/utils.py
@@ -90,7 +90,8 @@ def get_build_output_path():
         board_product = para_dic.get("board_product", "")
         first_build_output = "%s_%s" % (board_series, board_type)
         second_build_output = "%s_%s" % (board_product, first_build_output)
-        build_output_name = os.path.join(first_build_output, second_build_output)
+        build_output_name = os.path.join(first_build_output,
+                                         second_build_output)
 
     build_output_path = os.path.join(
         sys.source_code_root_path,
-- 
Gitee