pcs自动化测试套适配

Signed-off-by: yangyuyan <yangyuyan4@huawei.com>
Change-Id: Ie95dad303294ce69ff655135e40a0af014b9cc79
This commit is contained in:
yangyuyan 2024-05-23 14:09:33 +08:00
parent cf3f5c169a
commit 92df8d4056
3 changed files with 8 additions and 0 deletions

View File

@ -497,6 +497,7 @@ template("ohos_deploy_xdevice") {
outputs = [
"${_suite_out_dir}/tools/xdevice-ohos-0.0.0.tar.gz",
"${_suite_out_dir}/tools/xdevice-0.0.0.tar.gz",
"${_suite_out_dir}/tools/xdevice-devicetest-0.0.0.tar.gz",
"${_suite_out_dir}/tools/run.sh",
"${_suite_out_dir}/tools/run.bat",
]

View File

@ -83,15 +83,19 @@ class XDeviceBuilder:
os.path.join(xtstools_othersign_dir, "add_root.sh"),
os.path.join(xtstools_othersign_dir, "add_trust_root.py")])
ohos_dir = os.path.join(self.args.source_dir, 'plugins', 'ohos')
devicetest_dir = os.path.join(self.args.source_dir, 'plugins', 'devicetest')
gen_dir0 = os.path.join(self.args.source_dir, 'dist')
gen_dir1 = os.path.join(ohos_dir, 'dist')
gen_dir2 = os.path.join(devicetest_dir, 'dist')
shutil.rmtree(gen_dir0, ignore_errors=True)
shutil.rmtree(gen_dir1, ignore_errors=True)
shutil.rmtree(gen_dir2, ignore_errors=True)
command0 = ["python", "setup.py", "sdist"]
command1 = ["python", "setup.py", "sdist"]
try:
subprocess.check_call(command0, cwd=self.args.source_dir)
subprocess.check_call(command1, cwd=ohos_dir)
subprocess.check_call(command0, cwd=devicetest_dir)
except subprocess.CalledProcessError as exc:
print('returncode: {} cmd: {} output: {}'.format(
exc.returncode, exc.cmd, exc.output))
@ -105,6 +109,8 @@ class XDeviceBuilder:
to_dir=True)
utils.copy_file(output=dist_tools_dir, source_dirs=gen_dir1,
to_dir=True)
utils.copy_file(output=dist_tools_dir, source_dirs=gen_dir2,
to_dir=True)
utils.copy_file(output=self.args.suite_out_dir, sources=run_scripts,
to_dir=True)
dist_sign_dir = os.path.join(self.args.suite_out_dir, 'sign')

View File

@ -30,6 +30,7 @@ def filter_modules(subsystem_data_file, test_packages):
subsystems.add("arkXtest")
subsystems.add("validator")
subsystems.add("driver")
subsystems.add("pcs")
selected_packages = []
for dep in test_packages:
if 'selected_subsystem=' in dep: