From 9b764b2d1a2a10daa6bb57ecfc58455714603384 Mon Sep 17 00:00:00 2001 From: liuchaochao Date: Wed, 18 Oct 2023 10:31:15 +0800 Subject: [PATCH] -sm 'fix returncode always 0' Signed-off-by: liuchaochao --- .../src/main/java/com/ohos/hapsigntool/HapSignTool.java | 1 + tools/auto_test.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hapsigntool/hap_sign_tool/src/main/java/com/ohos/hapsigntool/HapSignTool.java b/hapsigntool/hap_sign_tool/src/main/java/com/ohos/hapsigntool/HapSignTool.java index 7c6b83c5..ab4c6cdb 100644 --- a/hapsigntool/hap_sign_tool/src/main/java/com/ohos/hapsigntool/HapSignTool.java +++ b/hapsigntool/hap_sign_tool/src/main/java/com/ohos/hapsigntool/HapSignTool.java @@ -83,6 +83,7 @@ public final class HapSignTool { } catch (CustomException exception) { LOGGER.debug(exception.getMessage(), exception); LOGGER.error(exception.getMessage()); + System.exit(1); } } diff --git a/tools/auto_test.py b/tools/auto_test.py index f569d864..3cf38a9a 100644 --- a/tools/auto_test.py +++ b/tools/auto_test.py @@ -298,10 +298,11 @@ def run_target(case, cmd): if len(error) > 0: f.writelines(cmd + "\r\n") for line in error: - success = False f.writelines(str(line.strip()) + "\r\n") - command.wait() + code = command.wait() + if code != 0: + success = False end = time.time() case_result['total_cost'] = case_result['total_cost'] + (end - start) -- Gitee