Signed-off-by: qu-xianfei <quxianfei1@huawei.com>
Change-Id: Idab06ec21429014f6715279ba4a18abf5d8b35c0
This commit is contained in:
qu-xianfei 2024-03-30 11:52:22 +08:00
parent 0955435ab7
commit 6d4fd8cc81

View File

@ -144,7 +144,8 @@ template("ohos_testsuite_base") {
_suite_out_dir = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}" _suite_out_dir = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}"
subsystem_name = XTS_SUITENAME subsystem_name = XTS_SUITENAME
if (subsystem_name == "acts") { if (subsystem_name == "acts") {
_suite_out_dir = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/acts_autoCompatibility" _suite_out_dir =
"${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/acts_autoCompatibility"
} }
if (_project_type == "testhapassist") { if (_project_type == "testhapassist") {
_final_hap_path = "${_suite_out_dir}/testcases/${_hap_name}.hap" _final_hap_path = "${_suite_out_dir}/testcases/${_hap_name}.hap"
@ -221,7 +222,8 @@ template("ohos_testsuite_base") {
_archive_testfile = "" _archive_testfile = ""
subsystem_name = XTS_SUITENAME subsystem_name = XTS_SUITENAME
if (subsystem_name == "acts") { if (subsystem_name == "acts") {
_suite_out_dir = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/acts_autoCompatibility" _suite_out_dir =
"${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/acts_autoCompatibility"
} }
if (_project_type == "testhapassist" || _project_type == "testappassist") { if (_project_type == "testhapassist" || _project_type == "testappassist") {
_archive_testfile = _archive_testfile =
@ -443,7 +445,8 @@ template("ohos_deploy_xdevice") {
if (_hap_name == "validator") { if (_hap_name == "validator") {
_suite_out_dir = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/acts_validator" _suite_out_dir = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/acts_validator"
} else { } else {
_suite_out_dir = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/acts_autoCompatibility" _suite_out_dir =
"${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/acts_autoCompatibility"
} }
} }