From 099fb76047f503ac929b4256c065e878a9def28c Mon Sep 17 00:00:00 2001 From: yuyan0428 Date: Fri, 2 Sep 2022 10:29:49 +0000 Subject: [PATCH 1/2] Signed-off-by: yuyan0428 Signed-off-by: yuyan0428 --- src/core/driver/drivers.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/driver/drivers.py b/src/core/driver/drivers.py index e4e6607..10946fd 100755 --- a/src/core/driver/drivers.py +++ b/src/core/driver/drivers.py @@ -400,17 +400,17 @@ class ResultManager(object): "coverage", "data", "cxx", - self.testsuite_name)) + self.testsuite_name + '_' + self.config.testtype[0])) if self.is_exist_target_in_device(DEFAULT_TEST_PATH, target_name): if not os.path.exists(cxx_cov_path): os.makedirs(cxx_cov_path) self.config.device.execute_shell_command( - "cd %s; tar -cvf %s.tar %s" % (DEFAULT_TEST_PATH, target_name, target_name)) - src_file_tar = os.path.join(DEFAULT_TEST_PATH, "%s.tar" % target_name) + "cd %s; tar -czf %s.tar.gz %s" % (DEFAULT_TEST_PATH, target_name, target_name)) + src_file_tar = os.path.join(DEFAULT_TEST_PATH, "%s.tar.gz" % target_name) self.device.pull_file(src_file_tar, cxx_cov_path, is_create=True, timeout=TIME_OUT) - subprocess.Popen("tar -xvf %s -C %s" % (os.path.join(cxx_cov_path, "%s.tar" % target_name), cxx_cov_path), - stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=False) + subprocess.Popen("tar zxf %s -C %s" % (os.path.join(cxx_cov_path, "%s.tar.gz" % target_name), cxx_cov_path), + stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=False) ############################################################################## -- Gitee From feba22c0efd7a4543d75e8ffb6d851c7bea4f82e Mon Sep 17 00:00:00 2001 From: yuyan0428 Date: Sat, 3 Sep 2022 02:14:26 +0000 Subject: [PATCH 2/2] Signed-off-by: yuyan0428 Signed-off-by: yuyan0428 --- src/core/driver/drivers.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/core/driver/drivers.py b/src/core/driver/drivers.py index 10946fd..e1e418f 100755 --- a/src/core/driver/drivers.py +++ b/src/core/driver/drivers.py @@ -409,8 +409,12 @@ class ResultManager(object): "cd %s; tar -czf %s.tar.gz %s" % (DEFAULT_TEST_PATH, target_name, target_name)) src_file_tar = os.path.join(DEFAULT_TEST_PATH, "%s.tar.gz" % target_name) self.device.pull_file(src_file_tar, cxx_cov_path, is_create=True, timeout=TIME_OUT) - subprocess.Popen("tar zxf %s -C %s" % (os.path.join(cxx_cov_path, "%s.tar.gz" % target_name), cxx_cov_path), - stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=False) + result = os.popen("tar -zxf %s -C %s" % (os.path.join(cxx_cov_path, "%s.tar.gz" % target_name), cxx_cov_path)) + result.close() + if platform.system() == "Windows": + os.remove("%s" % os.path.join(cxx_cov_path, "%s.tar.gz" % target_name)) + else: + os.system("rm -rf %s" % os.path.join(cxx_cov_path, "%s.tar.gz" % target_name)) ############################################################################## -- Gitee