From 8566518c8094a820e7f5b25f185a39050fda26c6 Mon Sep 17 00:00:00 2001 From: sunmingze Date: Fri, 13 Sep 2024 15:58:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?validator=E6=96=B0=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: sunmingze --- build/suite.gni | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/suite.gni b/build/suite.gni index 166a64bd..ff0722df 100755 --- a/build/suite.gni +++ b/build/suite.gni @@ -241,9 +241,9 @@ template("ohos_testsuite_base") { if (_project_type == "testhapassist" || _project_type == "testappassist") { _archive_testfile = "${_suite_out_dir}/testcases/module_${_archive_filename}" - } else if (_project_type == "testhap") { + } else if (_project_type == "testapp") { _hap_name = invoker.hap_name - if (_hap_name == "validator" && subsystem_name == "acts") { + if (_hap_name == "validator") { _suite_out_dir = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/acts-validator" _archive_testfile = "${_suite_out_dir}/testcases/${_archive_filename}" } else { From 5464aa61c65e15b662173bdc6a207b6f36dc8b8f Mon Sep 17 00:00:00 2001 From: sunmingze Date: Sat, 14 Sep 2024 09:43:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?validator=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: sunmingze --- build/suite.gni | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/suite.gni b/build/suite.gni index ff0722df..dd523fdf 100755 --- a/build/suite.gni +++ b/build/suite.gni @@ -243,7 +243,7 @@ template("ohos_testsuite_base") { "${_suite_out_dir}/testcases/module_${_archive_filename}" } else if (_project_type == "testapp") { _hap_name = invoker.hap_name - if (_hap_name == "validator") { + if (_hap_name == "validator" && subsystem_name == "acts") { _suite_out_dir = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/acts-validator" _archive_testfile = "${_suite_out_dir}/testcases/${_archive_filename}" } else {