From d2cfd3c54fd27ea302af390c3c9e9ae60cf26604 Mon Sep 17 00:00:00 2001 From: Jiajun Xu Date: Thu, 10 Feb 2011 22:50:14 +0800 Subject: qemuimagetest: Rename test scenario file from poky-image-sdk to poky-image-sato-sdk Signed-off-by Jiajun Xu --- scripts/qemuimage-testlib | 6 ++++-- scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato-sdk | 9 +++++++++ scripts/qemuimage-tests/scenario/qemuarm/poky-image-sdk | 9 --------- scripts/qemuimage-tests/scenario/qemumips/poky-image-sato-sdk | 9 +++++++++ scripts/qemuimage-tests/scenario/qemumips/poky-image-sdk | 9 --------- scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato-sdk | 9 +++++++++ scripts/qemuimage-tests/scenario/qemuppc/poky-image-sdk | 9 --------- scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato-sdk | 9 +++++++++ scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sdk | 9 --------- scripts/qemuimage-tests/scenario/qemux86/poky-image-sato-sdk | 9 +++++++++ scripts/qemuimage-tests/scenario/qemux86/poky-image-sdk | 9 --------- 11 files changed, 49 insertions(+), 47 deletions(-) create mode 100644 scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato-sdk delete mode 100644 scripts/qemuimage-tests/scenario/qemuarm/poky-image-sdk create mode 100644 scripts/qemuimage-tests/scenario/qemumips/poky-image-sato-sdk delete mode 100644 scripts/qemuimage-tests/scenario/qemumips/poky-image-sdk create mode 100644 scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato-sdk delete mode 100644 scripts/qemuimage-tests/scenario/qemuppc/poky-image-sdk create mode 100644 scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato-sdk delete mode 100644 scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sdk create mode 100644 scripts/qemuimage-tests/scenario/qemux86/poky-image-sato-sdk delete mode 100644 scripts/qemuimage-tests/scenario/qemux86/poky-image-sdk (limited to 'scripts') diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib index 823cbfa18..720ee8f40 100644 --- a/scripts/qemuimage-testlib +++ b/scripts/qemuimage-testlib @@ -305,7 +305,8 @@ Test_Find_Image() else for i in `dir ${where}` do - echo $i | grep -q "${kernel}.*${arch}.*\.${extension}" + # Exclude qemux86-64 when target is qemux86 + echo $i | grep "${kernel}.*${arch}.*\.${extension}" | grep -qv "${kernel}.*${arch}-64.*\.${extension}" if [ $? -eq 0 ]; then echo ${where}/${i} return 0 @@ -323,7 +324,8 @@ Test_Find_Image() else for i in `dir ${where}` do - echo $i | grep -q "${target}-${arch}.*\.${extension}" + # Exclude qemux86-64 when target is qemux86 + echo $i | grep "${target}-${arch}.*\.${extension}" | grep -qv "${target}-${arch}-64.*\.${extension}" if [ $? -eq 0 ]; then echo ${where}/${i} return 0 diff --git a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato-sdk b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato-sdk new file mode 100644 index 000000000..42b8e1902 --- /dev/null +++ b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato-sdk @@ -0,0 +1,9 @@ +sanity ssh +sanity scp +sanity dmesg +sanity zypper_help +sanity zypper_search +sanity rpm_query +sanity compiler +sanity connman +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sdk deleted file mode 100644 index 42b8e1902..000000000 --- a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sdk +++ /dev/null @@ -1,9 +0,0 @@ -sanity ssh -sanity scp -sanity dmesg -sanity zypper_help -sanity zypper_search -sanity rpm_query -sanity compiler -sanity connman -sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato-sdk b/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato-sdk new file mode 100644 index 000000000..42b8e1902 --- /dev/null +++ b/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato-sdk @@ -0,0 +1,9 @@ +sanity ssh +sanity scp +sanity dmesg +sanity zypper_help +sanity zypper_search +sanity rpm_query +sanity compiler +sanity connman +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemumips/poky-image-sdk deleted file mode 100644 index 42b8e1902..000000000 --- a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sdk +++ /dev/null @@ -1,9 +0,0 @@ -sanity ssh -sanity scp -sanity dmesg -sanity zypper_help -sanity zypper_search -sanity rpm_query -sanity compiler -sanity connman -sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato-sdk b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato-sdk new file mode 100644 index 000000000..42b8e1902 --- /dev/null +++ b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato-sdk @@ -0,0 +1,9 @@ +sanity ssh +sanity scp +sanity dmesg +sanity zypper_help +sanity zypper_search +sanity rpm_query +sanity compiler +sanity connman +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sdk deleted file mode 100644 index 42b8e1902..000000000 --- a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sdk +++ /dev/null @@ -1,9 +0,0 @@ -sanity ssh -sanity scp -sanity dmesg -sanity zypper_help -sanity zypper_search -sanity rpm_query -sanity compiler -sanity connman -sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato-sdk b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato-sdk new file mode 100644 index 000000000..42b8e1902 --- /dev/null +++ b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato-sdk @@ -0,0 +1,9 @@ +sanity ssh +sanity scp +sanity dmesg +sanity zypper_help +sanity zypper_search +sanity rpm_query +sanity compiler +sanity connman +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sdk deleted file mode 100644 index 42b8e1902..000000000 --- a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sdk +++ /dev/null @@ -1,9 +0,0 @@ -sanity ssh -sanity scp -sanity dmesg -sanity zypper_help -sanity zypper_search -sanity rpm_query -sanity compiler -sanity connman -sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato-sdk b/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato-sdk new file mode 100644 index 000000000..42b8e1902 --- /dev/null +++ b/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato-sdk @@ -0,0 +1,9 @@ +sanity ssh +sanity scp +sanity dmesg +sanity zypper_help +sanity zypper_search +sanity rpm_query +sanity compiler +sanity connman +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemux86/poky-image-sdk deleted file mode 100644 index 42b8e1902..000000000 --- a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sdk +++ /dev/null @@ -1,9 +0,0 @@ -sanity ssh -sanity scp -sanity dmesg -sanity zypper_help -sanity zypper_search -sanity rpm_query -sanity compiler -sanity connman -sanity shutdown -- cgit v1.2.3