diff options
Diffstat (limited to 'scripts/qemuimage-tests')
24 files changed, 29 insertions, 24 deletions
diff --git a/scripts/qemuimage-tests/sanity/compiler b/scripts/qemuimage-tests/sanity/compiler index 0290540e71..d3168a973c 100755 --- a/scripts/qemuimage-tests/sanity/compiler +++ b/scripts/qemuimage-tests/sanity/compiler | |||
@@ -11,7 +11,7 @@ | |||
11 | 11 | ||
12 | . $POKYBASE/scripts/qemuimage-testlib | 12 | . $POKYBASE/scripts/qemuimage-testlib |
13 | 13 | ||
14 | TIMEOUT=360 | 14 | TIMEOUT=200 |
15 | RET=1 | 15 | RET=1 |
16 | 16 | ||
17 | # Start qemu and check its network | 17 | # Start qemu and check its network |
diff --git a/scripts/qemuimage-tests/sanity/connman b/scripts/qemuimage-tests/sanity/connman index 8c5b7c5cf6..6e19b81b16 100755 --- a/scripts/qemuimage-tests/sanity/connman +++ b/scripts/qemuimage-tests/sanity/connman | |||
@@ -11,7 +11,7 @@ | |||
11 | 11 | ||
12 | . $POKYBASE/scripts/qemuimage-testlib | 12 | . $POKYBASE/scripts/qemuimage-testlib |
13 | 13 | ||
14 | TIMEOUT=360 | 14 | TIMEOUT=200 |
15 | RET=1 | 15 | RET=1 |
16 | 16 | ||
17 | # Start qemu and check its network | 17 | # Start qemu and check its network |
diff --git a/scripts/qemuimage-tests/sanity/dmesg b/scripts/qemuimage-tests/sanity/dmesg index 36813dcd43..d98d7aff84 100755 --- a/scripts/qemuimage-tests/sanity/dmesg +++ b/scripts/qemuimage-tests/sanity/dmesg | |||
@@ -11,7 +11,7 @@ | |||
11 | 11 | ||
12 | . $POKYBASE/scripts/qemuimage-testlib | 12 | . $POKYBASE/scripts/qemuimage-testlib |
13 | 13 | ||
14 | TIMEOUT=360 | 14 | TIMEOUT=200 |
15 | RET=1 | 15 | RET=1 |
16 | 16 | ||
17 | # Start qemu and check its network | 17 | # Start qemu and check its network |
diff --git a/scripts/qemuimage-tests/sanity/rpm_query b/scripts/qemuimage-tests/sanity/rpm_query index 9962115d67..7663901962 100755 --- a/scripts/qemuimage-tests/sanity/rpm_query +++ b/scripts/qemuimage-tests/sanity/rpm_query | |||
@@ -11,7 +11,7 @@ | |||
11 | 11 | ||
12 | . $POKYBASE/scripts/qemuimage-testlib | 12 | . $POKYBASE/scripts/qemuimage-testlib |
13 | 13 | ||
14 | TIMEOUT=360 | 14 | TIMEOUT=200 |
15 | RET=1 | 15 | RET=1 |
16 | 16 | ||
17 | # Start qemu and check its network | 17 | # Start qemu and check its network |
diff --git a/scripts/qemuimage-tests/sanity/scp b/scripts/qemuimage-tests/sanity/scp index ce3489d664..ca19857928 100755 --- a/scripts/qemuimage-tests/sanity/scp +++ b/scripts/qemuimage-tests/sanity/scp | |||
@@ -11,7 +11,7 @@ | |||
11 | 11 | ||
12 | . $POKYBASE/scripts/qemuimage-testlib | 12 | . $POKYBASE/scripts/qemuimage-testlib |
13 | 13 | ||
14 | TIMEOUT=360 | 14 | TIMEOUT=200 |
15 | RET=1 | 15 | RET=1 |
16 | SPID=0 | 16 | SPID=0 |
17 | i=0 | 17 | i=0 |
diff --git a/scripts/qemuimage-tests/sanity/shutdown b/scripts/qemuimage-tests/sanity/shutdown index e36b4a983d..dde03c9a10 100755 --- a/scripts/qemuimage-tests/sanity/shutdown +++ b/scripts/qemuimage-tests/sanity/shutdown | |||
@@ -13,7 +13,12 @@ | |||
13 | 13 | ||
14 | . $POKYBASE/scripts/qemuimage-testlib | 14 | . $POKYBASE/scripts/qemuimage-testlib |
15 | 15 | ||
16 | TIMEOUT=360 | 16 | if [ $SHARE_IMAGE -eq 0 ]; then |
17 | TIMEOUT=200 | ||
18 | elif [ $SHARE_IMAGE -eq 1 ]; then | ||
19 | TIMEOUT=500 | ||
20 | fi | ||
21 | |||
17 | RET=1 | 22 | RET=1 |
18 | i=0 | 23 | i=0 |
19 | 24 | ||
diff --git a/scripts/qemuimage-tests/sanity/ssh b/scripts/qemuimage-tests/sanity/ssh index 084530adfb..e0ade72ca3 100755 --- a/scripts/qemuimage-tests/sanity/ssh +++ b/scripts/qemuimage-tests/sanity/ssh | |||
@@ -11,7 +11,7 @@ | |||
11 | 11 | ||
12 | . $POKYBASE/scripts/qemuimage-testlib | 12 | . $POKYBASE/scripts/qemuimage-testlib |
13 | 13 | ||
14 | TIMEOUT=360 | 14 | TIMEOUT=200 |
15 | RET=1 | 15 | RET=1 |
16 | 16 | ||
17 | # Start qemu and check its network | 17 | # Start qemu and check its network |
diff --git a/scripts/qemuimage-tests/sanity/zypper_help b/scripts/qemuimage-tests/sanity/zypper_help index e052501957..48e121c9e1 100755 --- a/scripts/qemuimage-tests/sanity/zypper_help +++ b/scripts/qemuimage-tests/sanity/zypper_help | |||
@@ -11,7 +11,7 @@ | |||
11 | 11 | ||
12 | . $POKYBASE/scripts/qemuimage-testlib | 12 | . $POKYBASE/scripts/qemuimage-testlib |
13 | 13 | ||
14 | TIMEOUT=360 | 14 | TIMEOUT=200 |
15 | RET=1 | 15 | RET=1 |
16 | 16 | ||
17 | # Start qemu and check its network | 17 | # Start qemu and check its network |
diff --git a/scripts/qemuimage-tests/sanity/zypper_search b/scripts/qemuimage-tests/sanity/zypper_search index b756db8fa3..9ae69ebf1f 100755 --- a/scripts/qemuimage-tests/sanity/zypper_search +++ b/scripts/qemuimage-tests/sanity/zypper_search | |||
@@ -11,7 +11,7 @@ | |||
11 | 11 | ||
12 | . $POKYBASE/scripts/qemuimage-testlib | 12 | . $POKYBASE/scripts/qemuimage-testlib |
13 | 13 | ||
14 | TIMEOUT=360 | 14 | TIMEOUT=200 |
15 | RET=1 | 15 | RET=1 |
16 | 16 | ||
17 | # Start qemu and check its network | 17 | # 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 32d2bd144b..0eb1926cfd 100644 --- a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb +++ b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb | |||
@@ -1,8 +1,8 @@ | |||
1 | sanity shutdown | ||
1 | sanity boot | 2 | sanity boot |
2 | sanity ssh | 3 | sanity ssh |
3 | sanity scp | 4 | sanity scp |
4 | sanity dmesg | 5 | sanity dmesg |
5 | sanity shutdown | ||
6 | sanity zypper_help | 6 | sanity zypper_help |
7 | sanity zypper_search | 7 | sanity zypper_search |
8 | sanity rpm_query | 8 | sanity rpm_query |
diff --git a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato index 7b949a854c..b60a89af51 100644 --- a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato +++ b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato | |||
@@ -1,8 +1,8 @@ | |||
1 | sanity shutdown | ||
1 | sanity boot | 2 | sanity boot |
2 | sanity ssh | 3 | sanity ssh |
3 | sanity scp | 4 | sanity scp |
4 | sanity dmesg | 5 | sanity dmesg |
5 | sanity shutdown | ||
6 | sanity zypper_help | 6 | sanity zypper_help |
7 | sanity zypper_search | 7 | sanity zypper_search |
8 | sanity rpm_query | 8 | sanity rpm_query |
diff --git a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sdk index 3a8b1293bd..53c9ad591e 100644 --- a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sdk +++ b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sdk | |||
@@ -1,8 +1,8 @@ | |||
1 | sanity shutdown | ||
1 | sanity boot | 2 | sanity boot |
2 | sanity ssh | 3 | sanity ssh |
3 | sanity scp | 4 | sanity scp |
4 | sanity dmesg | 5 | sanity dmesg |
5 | sanity shutdown | ||
6 | sanity zypper_help | 6 | sanity zypper_help |
7 | sanity zypper_search | 7 | sanity zypper_search |
8 | sanity rpm_query | 8 | sanity rpm_query |
diff --git a/scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb index 32d2bd144b..0eb1926cfd 100644 --- a/scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb +++ b/scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb | |||
@@ -1,8 +1,8 @@ | |||
1 | sanity shutdown | ||
1 | sanity boot | 2 | sanity boot |
2 | sanity ssh | 3 | sanity ssh |
3 | sanity scp | 4 | sanity scp |
4 | sanity dmesg | 5 | sanity dmesg |
5 | sanity shutdown | ||
6 | sanity zypper_help | 6 | sanity zypper_help |
7 | sanity zypper_search | 7 | sanity zypper_search |
8 | sanity rpm_query | 8 | sanity rpm_query |
diff --git a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato b/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato index 7b949a854c..b60a89af51 100644 --- a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato +++ b/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato | |||
@@ -1,8 +1,8 @@ | |||
1 | sanity shutdown | ||
1 | sanity boot | 2 | sanity boot |
2 | sanity ssh | 3 | sanity ssh |
3 | sanity scp | 4 | sanity scp |
4 | sanity dmesg | 5 | sanity dmesg |
5 | sanity shutdown | ||
6 | sanity zypper_help | 6 | sanity zypper_help |
7 | sanity zypper_search | 7 | sanity zypper_search |
8 | sanity rpm_query | 8 | sanity rpm_query |
diff --git a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemumips/poky-image-sdk index 3a8b1293bd..53c9ad591e 100644 --- a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sdk +++ b/scripts/qemuimage-tests/scenario/qemumips/poky-image-sdk | |||
@@ -1,8 +1,8 @@ | |||
1 | sanity shutdown | ||
1 | sanity boot | 2 | sanity boot |
2 | sanity ssh | 3 | sanity ssh |
3 | sanity scp | 4 | sanity scp |
4 | sanity dmesg | 5 | sanity dmesg |
5 | sanity shutdown | ||
6 | sanity zypper_help | 6 | sanity zypper_help |
7 | sanity zypper_search | 7 | sanity zypper_search |
8 | sanity rpm_query | 8 | sanity rpm_query |
diff --git a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb index 32d2bd144b..0eb1926cfd 100644 --- a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb +++ b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb | |||
@@ -1,8 +1,8 @@ | |||
1 | sanity shutdown | ||
1 | sanity boot | 2 | sanity boot |
2 | sanity ssh | 3 | sanity ssh |
3 | sanity scp | 4 | sanity scp |
4 | sanity dmesg | 5 | sanity dmesg |
5 | sanity shutdown | ||
6 | sanity zypper_help | 6 | sanity zypper_help |
7 | sanity zypper_search | 7 | sanity zypper_search |
8 | sanity rpm_query | 8 | sanity rpm_query |
diff --git a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato index 7b949a854c..b60a89af51 100644 --- a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato +++ b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato | |||
@@ -1,8 +1,8 @@ | |||
1 | sanity shutdown | ||
1 | sanity boot | 2 | sanity boot |
2 | sanity ssh | 3 | sanity ssh |
3 | sanity scp | 4 | sanity scp |
4 | sanity dmesg | 5 | sanity dmesg |
5 | sanity shutdown | ||
6 | sanity zypper_help | 6 | sanity zypper_help |
7 | sanity zypper_search | 7 | sanity zypper_search |
8 | sanity rpm_query | 8 | sanity rpm_query |
diff --git a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sdk index 3a8b1293bd..53c9ad591e 100644 --- a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sdk +++ b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sdk | |||
@@ -1,8 +1,8 @@ | |||
1 | sanity shutdown | ||
1 | sanity boot | 2 | sanity boot |
2 | sanity ssh | 3 | sanity ssh |
3 | sanity scp | 4 | sanity scp |
4 | sanity dmesg | 5 | sanity dmesg |
5 | sanity shutdown | ||
6 | sanity zypper_help | 6 | sanity zypper_help |
7 | sanity zypper_search | 7 | sanity zypper_search |
8 | sanity rpm_query | 8 | sanity rpm_query |
diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb index 32d2bd144b..0eb1926cfd 100644 --- a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb +++ b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb | |||
@@ -1,8 +1,8 @@ | |||
1 | sanity shutdown | ||
1 | sanity boot | 2 | sanity boot |
2 | sanity ssh | 3 | sanity ssh |
3 | sanity scp | 4 | sanity scp |
4 | sanity dmesg | 5 | sanity dmesg |
5 | sanity shutdown | ||
6 | sanity zypper_help | 6 | sanity zypper_help |
7 | sanity zypper_search | 7 | sanity zypper_search |
8 | sanity rpm_query | 8 | sanity rpm_query |
diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato index 7b949a854c..b60a89af51 100644 --- a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato +++ b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato | |||
@@ -1,8 +1,8 @@ | |||
1 | sanity shutdown | ||
1 | sanity boot | 2 | sanity boot |
2 | sanity ssh | 3 | sanity ssh |
3 | sanity scp | 4 | sanity scp |
4 | sanity dmesg | 5 | sanity dmesg |
5 | sanity shutdown | ||
6 | sanity zypper_help | 6 | sanity zypper_help |
7 | sanity zypper_search | 7 | sanity zypper_search |
8 | sanity rpm_query | 8 | sanity rpm_query |
diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sdk index 3a8b1293bd..53c9ad591e 100644 --- a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sdk +++ b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sdk | |||
@@ -1,8 +1,8 @@ | |||
1 | sanity shutdown | ||
1 | sanity boot | 2 | sanity boot |
2 | sanity ssh | 3 | sanity ssh |
3 | sanity scp | 4 | sanity scp |
4 | sanity dmesg | 5 | sanity dmesg |
5 | sanity shutdown | ||
6 | sanity zypper_help | 6 | sanity zypper_help |
7 | sanity zypper_search | 7 | sanity zypper_search |
8 | sanity rpm_query | 8 | sanity rpm_query |
diff --git a/scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb index 32d2bd144b..0eb1926cfd 100644 --- a/scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb +++ b/scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb | |||
@@ -1,8 +1,8 @@ | |||
1 | sanity shutdown | ||
1 | sanity boot | 2 | sanity boot |
2 | sanity ssh | 3 | sanity ssh |
3 | sanity scp | 4 | sanity scp |
4 | sanity dmesg | 5 | sanity dmesg |
5 | sanity shutdown | ||
6 | sanity zypper_help | 6 | sanity zypper_help |
7 | sanity zypper_search | 7 | sanity zypper_search |
8 | sanity rpm_query | 8 | sanity rpm_query |
diff --git a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato b/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato index 7b949a854c..b60a89af51 100644 --- a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato +++ b/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato | |||
@@ -1,8 +1,8 @@ | |||
1 | sanity shutdown | ||
1 | sanity boot | 2 | sanity boot |
2 | sanity ssh | 3 | sanity ssh |
3 | sanity scp | 4 | sanity scp |
4 | sanity dmesg | 5 | sanity dmesg |
5 | sanity shutdown | ||
6 | sanity zypper_help | 6 | sanity zypper_help |
7 | sanity zypper_search | 7 | sanity zypper_search |
8 | sanity rpm_query | 8 | sanity rpm_query |
diff --git a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemux86/poky-image-sdk index 3a8b1293bd..53c9ad591e 100644 --- a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sdk +++ b/scripts/qemuimage-tests/scenario/qemux86/poky-image-sdk | |||
@@ -1,8 +1,8 @@ | |||
1 | sanity shutdown | ||
1 | sanity boot | 2 | sanity boot |
2 | sanity ssh | 3 | sanity ssh |
3 | sanity scp | 4 | sanity scp |
4 | sanity dmesg | 5 | sanity dmesg |
5 | sanity shutdown | ||
6 | sanity zypper_help | 6 | sanity zypper_help |
7 | sanity zypper_search | 7 | sanity zypper_search |
8 | sanity rpm_query | 8 | sanity rpm_query |