From: xuhy Date: Mon, 25 Mar 2024 14:38:42 +0000 (+0800) Subject: Merge branch 'master' into sandbox/xuhy/devel-riscv-py3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Fsandbox%2Fxuhy%2Fdevel-riscv-py3;p=tools%2Fitest-cases-mic.git Merge branch 'master' into sandbox/xuhy/devel-riscv-py3 Change-Id: I14496ef7ca2fb82a8947c0a6d8bcf294f5612c3d --- 8e31e614e158b75c7851f97eb3807d3f85c0d16d diff --cc cases/create/func_cases/mic_cr_auto_fs.case index 1fb97f1,ac9a46f..fbb7d2a --- a/cases/create/func_cases/mic_cr_auto_fs.case +++ b/cases/create/func_cases/mic_cr_auto_fs.case @@@ -34,9 -34,9 +34,15 @@@ if [ "$loop_used_before" -ne "$loop_use echo "Number of loop devices is not the same with previous number." exit 1 fi ++ ++mic_copied=$(grep -i -s "Copy host mic to bootstrap" log.file || true) ++if [ -n "$mic_copied" ];then fs_dir=$(ls mic-output/ | grep 'handset_blackbay_fs-.*-rs.tar.gz') - mic_version=$(mic --version 2>&1 | awk -F ' ' '{print $2}') + mic_version=$(mic --version 2>&1 | awk -F ' ' '$2 ~ /[0-9]/p{print $2}') python3 parse_manifest.py $fs_dir $mic_version ++else ++echo "mic is not copied." ++fi ]]> diff --cc cases/create/func_cases/mic_cr_auto_fs_d_v_i.case index cefd4b9,2a57b46..7324158 --- a/cases/create/func_cases/mic_cr_auto_fs_d_v_i.case +++ b/cases/create/func_cases/mic_cr_auto_fs_d_v_i.case @@@ -34,9 -34,9 +34,15 @@@ if [ "$loop_used_before" -ne "$loop_use echo "Number of loop devices is not the same with previous number." exit 1 fi ++ ++mic_copied=$(grep -i -s "Copy host mic to bootstrap" log.file || true) ++if [ -n "$mic_copied" ];then fs_dir=$(ls mic-output/ | grep 'handset_blackbay_fs_d_v_i-.*-rs.tar.gz') - mic_version=$(mic --version | awk '{print $2}') + mic_version=$(mic --version 2>&1 | awk -F ' ' '$2 ~ /[0-9]/p{print $2}') python3 parse_manifest.py $fs_dir $mic_version ++else ++echo "mic is not copied." ++fi ]]> diff --cc cases/create/func_cases/mic_cr_auto_fs_parameter_run_script.case index 9df78e5,8fdefc4..2f93456 --- a/cases/create/func_cases/mic_cr_auto_fs_parameter_run_script.case +++ b/cases/create/func_cases/mic_cr_auto_fs_parameter_run_script.case @@@ -33,9 -33,9 +33,15 @@@ if [ "$loop_used_before" -ne "$loop_use echo "Number of loop devices is not the same with previous number." exit 1 fi ++ ++mic_copied=$(grep -i -s "Copy host mic to bootstrap" log.file || true) ++if [ -n "$mic_copied" ];then fs_dir=$(ls mic-output/ | grep 'handset_blackbay_fs-.*-rs.tar.gz') - mic_version=$(mic --version 2>&1 | awk -F ' ' '{print $2}') + mic_version=$(mic --version 2>&1 | awk -F ' ' '$2 ~ /[0-9]/p{print $2}') python3 parse_manifest.py $fs_dir $mic_version ++else ++echo "mic is not copied." ++fi ]]> diff --cc cases/create/func_cases/mic_cr_auto_loop_http_tpk.case index 30b9a0d,30b9a0d..0000000 deleted file mode 100755,100755 --- a/cases/create/func_cases/mic_cr_auto_loop_http_tpk.case +++ /dev/null @@@ -1,33 -1,33 +1,0 @@@ -- -- Cp tpk to specific folder, and magic line in this ks file is: --# -*-mic2-options-*- -f loop -*-mic2-options-*- -- -- -- -- -- -- -- -- -- -- diff --cc cases/create/func_cases/mic_cr_qcow_check-pkgs_tmpfs_ia32.case index 2ebef79,2ebef79..0000000 deleted file mode 100755,100755 --- a/cases/create/func_cases/mic_cr_qcow_check-pkgs_tmpfs_ia32.case +++ /dev/null @@@ -1,63 -1,63 +1,0 @@@ -- -- Test option "check-pkgs". -- -- -- -- -- -- &1 | tee qcow2.log || true -- --grep "Packages absent in image: bashrr" qcow2.log -- --sudo $losetup_path -a -- --loop_used_after=$(sudo $losetup_path -a | wc -l) --if [ "$loop_used_before" -ne "$loop_used_after" ];then -- echo "Number of loop devices is not the same with previous number." -- exit 1 --fi -- --]]> -- -- diff --cc cases/create/func_cases/mic_cr_qcow_config_runtime_ia32.case index 6179cfd,6179cfd..0000000 deleted file mode 100755,100755 --- a/cases/create/func_cases/mic_cr_qcow_config_runtime_ia32.case +++ /dev/null @@@ -1,68 -1,68 +1,0 @@@ -- -- This test case is used to test the option -- "--config, --runtime" -- -- -- -- -- -- -- -- -- -- diff --cc cases/create/func_cases/mic_cr_qcow_local-pkgs_record-pkgs.case index e58be4b,e58be4b..0000000 deleted file mode 100755,100755 --- a/cases/create/func_cases/mic_cr_qcow_local-pkgs_record-pkgs.case +++ /dev/null @@@ -1,70 -1,70 +1,0 @@@ -- -- create qcow image with armv7l arch, and options is -- "--local-pkgs-path=./rpm --record-pkgs=name,content,license --taring-to=@NAME@.tar.gz" -- -- -- -- -- -- -- -- -- diff --cc cases/create/func_cases/mic_cr_qcow_logfile_conf_release_pkgmgr.case index b5861c0,b5861c0..0000000 deleted file mode 100755,100755 --- a/cases/create/func_cases/mic_cr_qcow_logfile_conf_release_pkgmgr.case +++ /dev/null @@@ -1,76 -1,76 +1,0 @@@ -- -- create qcow image with option --"--logfile=/custome/arm.log -c conf/mic.conf --release=tizen-2.2_20130719.3 --pkgmgr=zypp" -- -- -- -- -- -- -- -- -- diff --cc cases/create/func_cases/mic_cr_scriptlet_error.case index 93690d3,93690d3..0000000 deleted file mode 100755,100755 --- a/cases/create/func_cases/mic_cr_scriptlet_error.case +++ /dev/null @@@ -1,38 -1,38 +1,0 @@@ -- -- if exist any file in fixed folder "/tmp/.postscript/error/", mic will abort creating image -- -- -- -- -- -- -- -- -- -- -- -- -- diff --cc cases/create/mixed_cases/mic_cr_check_env.case index 38ba3ff,38ba3ff..0000000 deleted file mode 100755,100755 --- a/cases/create/mixed_cases/mic_cr_check_env.case +++ /dev/null @@@ -1,31 -1,31 +1,0 @@@ -- -- check if env is right -- -- -- -- -- -- -- -- diff --cc cases/create/mixed_cases/mic_cr_loop_full_ks.case index e22fb52,e22fb52..0000000 deleted file mode 100755,100755 --- a/cases/create/mixed_cases/mic_cr_loop_full_ks.case +++ /dev/null @@@ -1,51 -1,51 +1,0 @@@ -- -- This test case is used to test full part ks -- -- -- -- -- --import sys --import json --img_file = sys.argv[1] --mic_version = sys.argv[2] --manifest_file=open('mic-output/manifest.json') --manifest=json.load(manifest_file) --assert manifest['format'] == 'loop' --assert manifest['version'] == mic_version --assert manifest['loop']['pack'] == '.tar.gz' --assert img_file in manifest['loop']['image_files'] --assert manifest['loop']['partitions']['/'] == 'platform' --assert manifest['loop']['partitions']['/opt'] == 'data' --assert manifest['loop']['partitions']['/opt/usr'] == 'ums' -- -- -- -- -- diff --cc cases/create/mixed_cases/mic_cr_qcow_tpk_http_repo.case index 1f244a3,1f244a3..0000000 deleted file mode 100755,100755 --- a/cases/create/mixed_cases/mic_cr_qcow_tpk_http_repo.case +++ /dev/null @@@ -1,40 -1,40 +1,0 @@@ -- -- test if mic can install tpk sucessfully with local tpk repo -- -- -- -- -- -- -- -- diff --cc cases/create/neg_cases/negative_error-package-ks.case index b9eae9c,b9eae9c..0000000 deleted file mode 100755,100755 --- a/cases/create/neg_cases/negative_error-package-ks.case +++ /dev/null @@@ -1,27 -1,27 +1,0 @@@ -- -- create image with ks file use error package like named 'hg' -- -- -- -- -- -- -- -- diff --cc cases/create/opt_cases/mic_cr_loop_debug_ia32.case index 2884bec,2884bec..0000000 deleted file mode 100755,100755 --- a/cases/create/opt_cases/mic_cr_loop_debug_ia32.case +++ /dev/null @@@ -1,34 -1,34 +1,0 @@@ -- -- create loop image with armv7l arch and -d -v option -- -- -- -- -- -- &1 | tee mic1.log --grep -i 'Finished' mic1.log --grep -i 'Debug' mic1.log --sudo $losetup_path -a --loop_used_after=$(sudo $losetup_path -a | wc -l) --if [ "$loop_used_before" -ne "$loop_used_after" ];then -- echo "Number of loop devices is not the same with previous number." -- exit 1 --fi --grep -i 'Verbose' mic1.log --test -f ./out1/platform.img --]]> -- -- diff --cc cases/create/opt_cases/mic_cr_loop_interactive_ia32.case index c1cae00,c1cae00..0000000 deleted file mode 100755,100755 --- a/cases/create/opt_cases/mic_cr_loop_interactive_ia32.case +++ /dev/null @@@ -1,41 -1,41 +1,0 @@@ -- -- Test option "--interactive" ,"--non-interactive" -- -- -- -- -- -- &1 >> tmp.log" << EOF --n --EOF --grep ".* \[y/n](y): INFO" tmp.log --sudo $losetup_path -a --loop_used_after=$(sudo $losetup_path -a | wc -l) --if [ "$loop_used_before" -ne "$loop_used_after" ];then -- echo "Number of loop devices is not the same with previous number." -- exit 1 --fi -- --]]> -- -- diff --cc cases/create/opt_cases/mic_cr_loop_pkgmgr-yum_ia32.case index 6c09fb7,6c09fb7..0000000 deleted file mode 100755,100755 --- a/cases/create/opt_cases/mic_cr_loop_pkgmgr-yum_ia32.case +++ /dev/null @@@ -1,28 -1,28 +1,0 @@@ -- -- create loop image with pkgmgr is yum -- -- -- -- -- -- &1 | tee mic.log) --grep -i "Can't find backend: yum" mic.log --sudo $losetup_path -a --loop_used_after=$(sudo $losetup_path -a | wc -l) --if [ "$loop_used_before" -ne "$loop_used_after" ];then -- echo "Number of loop devices is not the same with previous number." -- exit 1 --fi --]]> -- -- diff --cc cases/create/opt_cases/mic_cr_qcow_logfile-current-file_ia32.case index 094313d,094313d..0000000 deleted file mode 100755,100755 --- a/cases/create/opt_cases/mic_cr_qcow_logfile-current-file_ia32.case +++ /dev/null @@@ -1,37 -1,37 +1,0 @@@ -- -- Test '--logfile' option of 'qcow' format image -- -- -- -- -- -- -- -- diff --cc fixtures/ks_files/env_section.ks index 6253794,6253794..cc227aa --- a/fixtures/ks_files/env_section.ks +++ b/fixtures/ks_files/env_section.ks @@@ -12,8 -12,8 +12,8 @@@ bootloader --timeout=0 --append="root desktop --autologinuser=tizen user --name tizen --groups audio,video --password 'tizen' --repo --name=Tizen-base --baseurl=http://download.tizen.org/releases/milestone/tizen/base/tizen-base_20180928.1/repos/standard/packages/ --save --gpgkey=0 --ssl_verify=no --repo --name=Tizen-main --baseurl=http://download.tizen.org/releases/milestone/tizen/unified/tizen-unified_20181024.1/repos/standard/packages/ --save --gpgkey=0 --ssl_verify=no ++repo --name=Tizen-base --baseurl=http://download.tizen.org/releases/milestone/TIZEN/Tizen/Tizen-Base/tizen-base_20230515.082838/repos/standard/packages/ --save --gpgkey=0 --ssl_verify=no ++repo --name=Tizen-main --baseurl=http://download.tizen.org/releases/milestone/TIZEN/Tizen/Tizen-Unified/tizen-unified_20230524.002652/repos/standard/packages/ --save --gpgkey=0 --ssl_verify=no %env VALUE1=0x1000