From 18b5d387c967a53f8f317c5931a23140e6a0c726 Mon Sep 17 00:00:00 2001 From: yuyan0428 Date: Sat, 15 Oct 2022 09:58:52 +0000 Subject: [PATCH] Signed-off-by: yuyan0428 Signed-off-by: yuyan0428 --- aw/python/distributed/common/devices.py | 2 +- aw/python/distributed/common/drivers.py | 4 ++-- aw/python/distributed/distribute/distribute.py | 4 ++-- src/core/command/distribute_execute.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/aw/python/distributed/common/devices.py b/aw/python/distributed/common/devices.py index 23b80c7..057d9c9 100755 --- a/aw/python/distributed/common/devices.py +++ b/aw/python/distributed/common/devices.py @@ -33,7 +33,7 @@ if platform.system() != 'Windows': else: QUOTATION_MARKS = "\"" -HDC_TOOLS = "hdc_std" +HDC_TOOLS = "hdc" ############################################################################## diff --git a/aw/python/distributed/common/drivers.py b/aw/python/distributed/common/drivers.py index 0649a62..c09ae37 100755 --- a/aw/python/distributed/common/drivers.py +++ b/aw/python/distributed/common/drivers.py @@ -65,7 +65,7 @@ def is_exist_target_in_device(device, path, target): def receive_coverage_data(device, result_path, suite_file, file_name): - file_dir = suite_file.split("distributedtest\\")[1].split("\\")[0] + file_dir = suite_file.split("distributedtest")[1].strip(os.sep).split(os.sep)[0] target_name = "obj" cxx_cov_path = os.path.abspath(os.path.join( result_path, @@ -116,7 +116,7 @@ class CppTestDriver(ITestDriver): def execute(self, suite_file, result_path, options, background=False): case_dir, file_name = os.path.split(suite_file) - dst_dir = case_dir.split("distributedtest\\")[1] + dst_dir = case_dir.split("distributedtest")[1].strip(os.sep) os.makedirs(os.path.join(result_path, "temp", dst_dir), exist_ok=True) long_command_path = tempfile.mkdtemp( diff --git a/aw/python/distributed/distribute/distribute.py b/aw/python/distributed/distribute/distribute.py index 889c112..06be095 100755 --- a/aw/python/distributed/distribute/distribute.py +++ b/aw/python/distributed/distribute/distribute.py @@ -276,7 +276,7 @@ class Distribute: @staticmethod def _query_device_major_uuid(device): device_sn = device.device_sn - command = "hdc_std -t %s shell hidumper -s 4700 -a 'buscenter -l local_device_info'" % device_sn + command = "hdc -t %s shell hidumper -s 4700 -a 'buscenter -l local_device_info'" % device_sn device_info = device.execute_command_with_output(command) if device_info == "": @@ -288,7 +288,7 @@ class Distribute: @staticmethod def _query_device_agent_uuid(device): device_sn = device.device_sn - command = "hdc_std -t %s shell hidumper -s 4700 -a 'buscenter -l remote_device_info'" % device_sn + command = "hdc -t %s shell hidumper -s 4700 -a 'buscenter -l remote_device_info'" % device_sn device_info = device.execute_command_with_output(command) if device_info == "": diff --git a/src/core/command/distribute_execute.py b/src/core/command/distribute_execute.py index c7c83c3..26e567a 100644 --- a/src/core/command/distribute_execute.py +++ b/src/core/command/distribute_execute.py @@ -52,7 +52,7 @@ class DbinderTest(unittest.TestCase): distribute.exec_major(self.major, major_target_name, self.result_path, options) result = os.path.join(self.result_path, 'result', - self.suits_dir.split("distributedtest\\")[1]) + self.suits_dir.split("distributedtest")[1].strip(os.sep)) source_path = "%s/%s.xml" % (self.major.test_path, major_target_name) if not os.path.exists(result): os.makedirs(result) -- Gitee