!26 【轻量级 PR】:修改xts构建概率module info记录不全问题

Merge pull request !26 from alex_hold/N/A
This commit is contained in:
openharmony_ci 2021-03-25 09:46:07 +08:00 committed by Gitee
commit ccff989b2e
2 changed files with 8 additions and 3 deletions

View File

@ -156,7 +156,7 @@ build_wifiiot()
suite_module_name=`python test/xts/tools/lite/build/utils.py --method_name get_modulename_by_buildtarget --arguments module_list_file=${module_list_file}#build_target=${suite_build_target}`
subsystem_name=`python test/xts/tools/lite/build/utils.py --method_name get_subsystem_name --arguments path=${element}`
python test/xts/tools/lite/build/utils.py --method_name record_testmodule_info --arguments build_target_name=${suite_module_name}#module_name=${suite_module_name}#subsystem_name=${subsystem_name}#suite_out_dir=${DIST_DIR}/json
python test/xts/tools/lite/build/utils.py --method_name record_testmodule_info --arguments build_target_name=${suite_module_name}#module_name=${suite_module_name}#subsystem_name=${subsystem_name}#suite_out_dir=${DIST_DIR}/json#same_file=True
mkdir -p ${suite_out_dir}/${subsystem_name}
cp -f ${BASE_HOME}/out/hispark_pegasus/wifiiot_hispark_pegasus/${WIFIIOT_OUTFILE} ${suite_out_dir}/${subsystem_name}/${suite_module_name}.bin

View File

@ -265,13 +265,18 @@ def get_python_cmd():
def record_testmodule_info(build_target_name, module_name,
subsystem_name, suite_out_dir):
subsystem_name, suite_out_dir, same_file=False):
if not build_target_name or not subsystem_name:
print(
'build_target_name or subsystem_name of testmodule "%s" '
'is invalid!' % module_name)
return
module_info_list_file = os.path.join(suite_out_dir, 'module_info.json')
if same_file:
module_info_list_file = os.path.join(suite_out_dir, 'module_info.json')
else:
module_info_list_file = os.path.join(suite_out_dir,
'{}_module_info.json'.format
(build_target_name))
module_info_data = {}
if os.path.exists(module_info_list_file):
try: