diff options
Diffstat (limited to 'scripts/qemuimage-tests')
24 files changed, 29 insertions, 43 deletions
diff --git a/scripts/qemuimage-tests/sanity/compiler b/scripts/qemuimage-tests/sanity/compiler index d3168a973..29dbfd9bb 100755 --- a/scripts/qemuimage-tests/sanity/compiler +++ b/scripts/qemuimage-tests/sanity/compiler @@ -11,7 +11,7 @@ . $POKYBASE/scripts/qemuimage-testlib -TIMEOUT=200 +TIMEOUT=400 RET=1 # Start qemu and check its network diff --git a/scripts/qemuimage-tests/sanity/connman b/scripts/qemuimage-tests/sanity/connman index 6e19b81b1..fca6a2784 100755 --- a/scripts/qemuimage-tests/sanity/connman +++ b/scripts/qemuimage-tests/sanity/connman @@ -11,7 +11,7 @@ . $POKYBASE/scripts/qemuimage-testlib -TIMEOUT=200 +TIMEOUT=400 RET=1 # Start qemu and check its network diff --git a/scripts/qemuimage-tests/sanity/dmesg b/scripts/qemuimage-tests/sanity/dmesg index d98d7aff8..5ed31b735 100755 --- a/scripts/qemuimage-tests/sanity/dmesg +++ b/scripts/qemuimage-tests/sanity/dmesg @@ -11,7 +11,7 @@ . $POKYBASE/scripts/qemuimage-testlib -TIMEOUT=200 +TIMEOUT=400 RET=1 # Start qemu and check its network diff --git a/scripts/qemuimage-tests/sanity/rpm_query b/scripts/qemuimage-tests/sanity/rpm_query index 766390196..08017ffbe 100755 --- a/scripts/qemuimage-tests/sanity/rpm_query +++ b/scripts/qemuimage-tests/sanity/rpm_query @@ -11,7 +11,7 @@ . $POKYBASE/scripts/qemuimage-testlib -TIMEOUT=200 +TIMEOUT=400 RET=1 # Start qemu and check its network diff --git a/scripts/qemuimage-tests/sanity/scp b/scripts/qemuimage-tests/sanity/scp index ca1985792..c72cdc9d6 100755 --- a/scripts/qemuimage-tests/sanity/scp +++ b/scripts/qemuimage-tests/sanity/scp @@ -11,7 +11,7 @@ . $POKYBASE/scripts/qemuimage-testlib -TIMEOUT=200 +TIMEOUT=400 RET=1 SPID=0 i=0 diff --git a/scripts/qemuimage-tests/sanity/shutdown b/scripts/qemuimage-tests/sanity/shutdown index dde03c9a1..bc08cf0fd 100755 --- a/scripts/qemuimage-tests/sanity/shutdown +++ b/scripts/qemuimage-tests/sanity/shutdown @@ -13,11 +13,7 @@ . $POKYBASE/scripts/qemuimage-testlib -if [ $SHARE_IMAGE -eq 0 ]; then - TIMEOUT=200 -elif [ $SHARE_IMAGE -eq 1 ]; then - TIMEOUT=500 -fi +TIMEOUT=400 RET=1 i=0 @@ -66,6 +62,11 @@ fi if [ ${RET} -eq 0 ]; then Test_Info "Shutdown Test PASS" Test_Print_Result "shutdown" 0 + + # Remove TARGET_IPSAVE since no existing qemu running now + if [ -e ${TARGET_IPSAVE} ]; then + rm -rf ${TARGET_IPSAVE} + fi exit 0 else Test_Info "Shutdown Test FAIL" diff --git a/scripts/qemuimage-tests/sanity/ssh b/scripts/qemuimage-tests/sanity/ssh index e0ade72ca..2a0e93439 100755 --- a/scripts/qemuimage-tests/sanity/ssh +++ b/scripts/qemuimage-tests/sanity/ssh @@ -11,7 +11,7 @@ . $POKYBASE/scripts/qemuimage-testlib -TIMEOUT=200 +TIMEOUT=400 RET=1 # Start qemu and check its network diff --git a/scripts/qemuimage-tests/sanity/zypper_help b/scripts/qemuimage-tests/sanity/zypper_help index 48e121c9e..1ab6d2407 100755 --- a/scripts/qemuimage-tests/sanity/zypper_help +++ b/scripts/qemuimage-tests/sanity/zypper_help @@ -11,7 +11,7 @@ . $POKYBASE/scripts/qemuimage-testlib -TIMEOUT=200 +TIMEOUT=400 RET=1 # Start qemu and check its network diff --git a/scripts/qemuimage-tests/sanity/zypper_search b/scripts/qemuimage-tests/sanity/zypper_search index 9ae69ebf1..d6bcd27a3 100755 --- a/scripts/qemuimage-tests/sanity/zypper_search +++ b/scripts/qemuimage-tests/sanity/zypper_search @@ -11,7 +11,7 @@ . $POKYBASE/scripts/qemuimage-testlib -TIMEOUT=200 +TIMEOUT=400 RET=1 # Start qemu and check its network diff --git a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb index 0eb1926cf..4fa606876 100644 --- a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb +++ b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb @@ -1,8 +1,7 @@ -sanity shutdown -sanity boot sanity ssh sanity scp sanity dmesg sanity zypper_help sanity zypper_search sanity rpm_query +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato index b60a89af5..7a6353e1a 100644 --- a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato +++ b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato @@ -1,5 +1,3 @@ -sanity shutdown -sanity boot sanity ssh sanity scp sanity dmesg @@ -7,3 +5,4 @@ sanity zypper_help sanity zypper_search sanity rpm_query sanity connman +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sdk index 53c9ad591..42b8e1902 100644 --- a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sdk +++ b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sdk @@ -1,5 +1,3 @@ -sanity shutdown -sanity boot sanity ssh sanity scp sanity dmesg @@ -8,3 +6,4 @@ sanity zypper_search sanity rpm_query sanity compiler sanity connman +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb index 0eb1926cf..4fa606876 100644 --- a/scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb +++ b/scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb @@ -1,8 +1,7 @@ -sanity shutdown -sanity boot sanity ssh sanity scp sanity dmesg sanity zypper_help sanity zypper_search sanity rpm_query +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato b/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato index b60a89af5..7a6353e1a 100644 --- a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato +++ b/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato @@ -1,5 +1,3 @@ -sanity shutdown -sanity boot sanity ssh sanity scp sanity dmesg @@ -7,3 +5,4 @@ sanity zypper_help sanity zypper_search sanity rpm_query sanity connman +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemumips/poky-image-sdk index 53c9ad591..42b8e1902 100644 --- a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sdk +++ b/scripts/qemuimage-tests/scenario/qemumips/poky-image-sdk @@ -1,5 +1,3 @@ -sanity shutdown -sanity boot sanity ssh sanity scp sanity dmesg @@ -8,3 +6,4 @@ sanity zypper_search sanity rpm_query sanity compiler sanity connman +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb index 0eb1926cf..4fa606876 100644 --- a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb +++ b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb @@ -1,8 +1,7 @@ -sanity shutdown -sanity boot sanity ssh sanity scp sanity dmesg sanity zypper_help sanity zypper_search sanity rpm_query +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato index b60a89af5..7a6353e1a 100644 --- a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato +++ b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato @@ -1,5 +1,3 @@ -sanity shutdown -sanity boot sanity ssh sanity scp sanity dmesg @@ -7,3 +5,4 @@ sanity zypper_help sanity zypper_search sanity rpm_query sanity connman +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sdk index 53c9ad591..42b8e1902 100644 --- a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sdk +++ b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sdk @@ -1,5 +1,3 @@ -sanity shutdown -sanity boot sanity ssh sanity scp sanity dmesg @@ -8,3 +6,4 @@ sanity zypper_search sanity rpm_query sanity compiler sanity connman +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb index 0eb1926cf..4fa606876 100644 --- a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb +++ b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb @@ -1,8 +1,7 @@ -sanity shutdown -sanity boot sanity ssh sanity scp sanity dmesg sanity zypper_help sanity zypper_search sanity rpm_query +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato index b60a89af5..7a6353e1a 100644 --- a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato +++ b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato @@ -1,5 +1,3 @@ -sanity shutdown -sanity boot sanity ssh sanity scp sanity dmesg @@ -7,3 +5,4 @@ sanity zypper_help sanity zypper_search sanity rpm_query 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 index 53c9ad591..42b8e1902 100644 --- a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sdk +++ b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sdk @@ -1,5 +1,3 @@ -sanity shutdown -sanity boot sanity ssh sanity scp sanity dmesg @@ -8,3 +6,4 @@ sanity zypper_search sanity rpm_query sanity compiler sanity connman +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb index 0eb1926cf..4fa606876 100644 --- a/scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb +++ b/scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb @@ -1,8 +1,7 @@ -sanity shutdown -sanity boot sanity ssh sanity scp sanity dmesg sanity zypper_help sanity zypper_search sanity rpm_query +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato b/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato index b60a89af5..7a6353e1a 100644 --- a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato +++ b/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato @@ -1,5 +1,3 @@ -sanity shutdown -sanity boot sanity ssh sanity scp sanity dmesg @@ -7,3 +5,4 @@ sanity zypper_help sanity zypper_search sanity rpm_query sanity connman +sanity shutdown diff --git a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemux86/poky-image-sdk index 53c9ad591..42b8e1902 100644 --- a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sdk +++ b/scripts/qemuimage-tests/scenario/qemux86/poky-image-sdk @@ -1,5 +1,3 @@ -sanity shutdown -sanity boot sanity ssh sanity scp sanity dmesg @@ -8,3 +6,4 @@ sanity zypper_search sanity rpm_query sanity compiler sanity connman +sanity shutdown |