Signed-off-by: qu-xianfei <quxianfei1@huawei.com>
This commit is contained in:
qu-xianfei 2024-04-03 09:46:54 +08:00
parent afde2493b1
commit 588f543f0a
2 changed files with 5 additions and 7 deletions

View File

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

View File

@ -33,7 +33,8 @@ ohos_executable("queryStandard") {
ohos_copy("cpQueStan") {
sources = [ "$root_out_dir/xts/tools/queryStandard" ]
if (XTS_SUITENAME == "acts") {
outputs = [ "$root_out_dir/suites/${XTS_SUITENAME}/acts/testcases/queryStandard" ]
outputs =
[ "$root_out_dir/suites/${XTS_SUITENAME}/acts/testcases/queryStandard" ]
} else {
outputs =
[ "$root_out_dir/suites/${XTS_SUITENAME}/testcases/queryStandard" ]