summary refs log tree commit diff stats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/boot-serial-test.c4
-rwxr-xr-xtests/vm/freebsd1
-rwxr-xr-xtests/vm/netbsd1
-rwxr-xr-xtests/vm/openbsd1
4 files changed, 5 insertions, 2 deletions
diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c
index 1355df924d..fca5f2f5da 100644
--- a/tests/boot-serial-test.c
+++ b/tests/boot-serial-test.c
@@ -116,8 +116,8 @@ static bool check_guest_output(const testdef_t *test, int fd)
     int i, nbr = 0, pos = 0, ccnt;
     char ch;
 
-    /* Poll serial output... Wait at most 60 seconds */
-    for (i = 0; i < 6000; ++i) {
+    /* Poll serial output... Wait at most 360 seconds */
+    for (i = 0; i < 36000; ++i) {
         ccnt = 0;
         while (ccnt++ < 512 && (nbr = read(fd, &ch, 1)) == 1) {
             if (ch == test->expect[pos]) {
diff --git a/tests/vm/freebsd b/tests/vm/freebsd
index 0a6ec4614a..b6983127d0 100755
--- a/tests/vm/freebsd
+++ b/tests/vm/freebsd
@@ -20,6 +20,7 @@ class FreeBSDVM(basevm.BaseVM):
     name = "freebsd"
     BUILD_SCRIPT = """
         set -e;
+        rm -rf /var/tmp/qemu-test.*
         cd $(mktemp -d /var/tmp/qemu-test.XXXXXX);
         tar -xf /dev/vtbd1;
         ./configure {configure_opts};
diff --git a/tests/vm/netbsd b/tests/vm/netbsd
index 45c9260dc0..a4e25820d5 100755
--- a/tests/vm/netbsd
+++ b/tests/vm/netbsd
@@ -20,6 +20,7 @@ class NetBSDVM(basevm.BaseVM):
     name = "netbsd"
     BUILD_SCRIPT = """
         set -e;
+        rm -rf /var/tmp/qemu-test.*
         cd $(mktemp -d /var/tmp/qemu-test.XXXXXX);
         tar -xf /dev/rld1a;
         ./configure --python=python2.7 {configure_opts};
diff --git a/tests/vm/openbsd b/tests/vm/openbsd
index 98edfbca4b..52500ee52b 100755
--- a/tests/vm/openbsd
+++ b/tests/vm/openbsd
@@ -20,6 +20,7 @@ class OpenBSDVM(basevm.BaseVM):
     name = "openbsd"
     BUILD_SCRIPT = """
         set -e;
+        rm -rf /var/tmp/qemu-test.*
         cd $(mktemp -d /var/tmp/qemu-test.XXXXXX);
         tar -xf /dev/rsd1c;
         ./configure --cc=x86_64-unknown-openbsd6.1-gcc-4.9.4 --python=python2.7 {configure_opts};