Fix can't get the mic version.

Change-Id: I0ad52595d9a341b99c157481ca340ec2f9fb9027
Signed-off-by: wanchao.xu <wanchao.xu@samsung.com>

diff --git a/cases/create/func_cases/mic_cr_auto_fs.case b/cases/create/func_cases/mic_cr_auto_fs.case
index 529669abace01f46f3894e2e2a6abc3f07f6ab99..b34cb9bc6e62509bb15abc2e7c156a5dfc74aab5 100755 (executable)
--- a/cases/create/func_cases/mic_cr_auto_fs.case
+++ b/cases/create/func_cases/mic_cr_auto_fs.case
@@ -35,7 +35,7 @@ if [ "$loop_used_before" -ne "$loop_used_after" ];then
     exit 1
 fi
 fs_dir=$(ls mic-output/ | grep 'handset_blackbay_fs-.*-rs.tar.gz')
-mic_version=$(mic --version  2>&1 | awk -F ' ' '$2 ~ /[0-9]/p{print $2}')
+mic_version=$(mic --version 2>&1 | tail -n 1 | awk -F ' ' '{print $2}')
 python2 parse_manifest.py $fs_dir $mic_version
 
 ]]>

diff --git 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
index f0c007bc4a881e69d1743411d4191963dc847edc..a4ae765ec99c72405d2c3e99d2ad501c6a0f0da2 100755 (executable)
--- 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
@@ -35,7 +35,7 @@ if [ "$loop_used_before" -ne "$loop_used_after" ];then
     exit 1
 fi
 fs_dir=$(ls mic-output/ | grep 'handset_blackbay_fs_d_v_i-.*-rs.tar.gz')
-mic_version=$(mic --version  2>&1 | awk -F ' ' '$2 ~ /[0-9]/p{print $2}')
+mic_version=$(mic --version 2>&1 | tail -n 1 | awk -F ' ' '{print $2}')
 python2 parse_manifest.py $fs_dir $mic_version
 
 ]]>

diff --git 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
index 34274b6c3de465003744add5522e6aad7854844d..6662eb6d2618caa9fc1c9b8f6b22e549ad1159a7 100755 (executable)
--- 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
@@ -34,7 +34,7 @@ if [ "$loop_used_before" -ne "$loop_used_after" ];then
     exit 1
 fi
 fs_dir=$(ls mic-output/ | grep 'handset_blackbay_fs-.*-rs.tar.gz')
-mic_version=$(mic --version  2>&1 | awk -F ' ' '$2 ~ /[0-9]/p{print $2}')
+mic_version=$(mic --version 2>&1 | tail -n 1 | awk -F ' ' '{print $2}')
 python2 parse_manifest.py $fs_dir $mic_version
 
 ]]>

diff --git a/cases/create/func_cases/mic_cr_auto_raw.case b/cases/create/func_cases/mic_cr_auto_raw.case
index 613c6fc860d2f733913e3833f3f5ff9bec91ebce..06afc99cc27185c94eb65fd06e91bcc3116a8ed3 100755 (executable)
--- a/cases/create/func_cases/mic_cr_auto_raw.case
+++ b/cases/create/func_cases/mic_cr_auto_raw.case
@@ -59,14 +59,14 @@ fi
 
 platform=$(python2 -c 'import platform;print platform.linux_distribution()[0].rstrip()')
 version=$(python2 -c 'import platform;print platform.linux_distribution()[1].rstrip()')
-if [ "$platform"="openSUSE" ] && [ "$version"=42.3 ]; then
+if [ "$platform" = "openSUSE" ] && [ "$version" = 42.3 ]; then
     #$raw_image_2=${raw_image##*/}"2"
     offset_2=$(sudo fdisk -lu $raw_image | grep $raw_image | sed -n '3p' | awk '{print $2}')
     let offset_2=$offset_2*512
     sudo mount -o loop,offset=$offset_2 $raw_image mic-output/ivi_dir/
     #(! sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep /dev/sdb)
     #sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep -i 'uuid'
-    mic_version=$(mic --version  2>&1 | awk -F ' ' '{print $2}')
+    mic_version=$(mic --version 2>&1 | tail -n 1 | awk -F ' ' '{print $2}')
     python2 parse_manifest.py $bz2img $mic_version $bmap
     exit 0
 else
@@ -87,7 +87,7 @@ else
                         sudo mount /dev/mapper/$second_part  mic-output/ivi_dir/ -t ext4
                         #(! sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep /dev/sdb)
                         #sudo chroot mic-output/ivi_dir/ cat /etc/fstab | grep -i 'uuid'
-                        mic_version=$(mic --version  2>&1 | awk -F ' ' '$2 ~ /[0-9]/p{print $2}')
+                        mic_version=$(mic --version 2>&1 | tail -n 1 | awk -F ' ' '{print $2}')
                         python2 parse_manifest.py $bz2img $mic_version $bmap
                         exit 0
                     else

diff --git a/cases/create/mixed_cases/mic_cr_loop_full_ks.case b/cases/create/mixed_cases/mic_cr_loop_full_ks.case
index 93c8dbe2f2948c4c7636bdadc8903c9a3f21a010..ed95f2ae176f76e8f30ae5f721d815a73df79d54 100755 (executable)
--- a/cases/create/mixed_cases/mic_cr_loop_full_ks.case
+++ b/cases/create/mixed_cases/mic_cr_loop_full_ks.case
@@ -41,7 +41,7 @@ sudo test -f mic-output/s5p4418-artik530-raptor-rev03.dtb
 end_preinstall_line=$(grep 'Preinstall' -n log.file | sed -n '$p' | awk -F ':' '{print $1}')
 start_install_line=$(grep 'Install' -n log.file  | sed -n '2p' | awk -F ':' '{print $1}')
 test $start_install_line -gt $end_preinstall_line
-mic_version=$(mic --version  2>&1 | awk -F ' ' '$2 ~ /[0-9]/p{print $2}')
+mic_version=$(mic --version 2>&1 | tail -n 1 | awk -F ' ' '{print $2}')
 python2 parse_manifest.py $img_file $mic_version
 sudo $losetup_path -a
 loop_used_after=$(sudo $losetup_path -a | wc -l)