Move test resources into 'resources' subdirectory

Signed-off-by: Euan Harris <euan.harris@citrix.com>

diff --git a/resources/cloudinit.iso b/resources/cloudinit.iso
new file mode 100644 (file)
index 0000000..f4dc5e1
Binary files /dev/null and b/resources/cloudinit.iso differ

diff --git a/resources/fetch-root-image.sh b/resources/fetch-root-image.sh
new file mode 100755 (executable)
index 0000000..5500dae
--- /dev/null
+++ b/resources/fetch-root-image.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+RESOURCES_DIR=$(dirname ${BASH_SOURCE[0]})
+cd $RESOURCES_DIR
+wget https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-22-20150521.x86_64.qcow2

diff --git a/resources/initrd.xen-4.0.4-301.fc22.x86_64 b/resources/initrd.xen-4.0.4-301.fc22.x86_64
new file mode 100644 (file)
index 0000000..2fb49ea
Binary files /dev/null and b/resources/initrd.xen-4.0.4-301.fc22.x86_64 differ

diff --git a/resources/vmlinuz-4.0.4-301.fc22.x86_64 b/resources/vmlinuz-4.0.4-301.fc22.x86_64
new file mode 100755 (executable)
index 0000000..b52ea12
Binary files /dev/null and b/resources/vmlinuz-4.0.4-301.fc22.x86_64 differ

diff --git a/test_domain_create_new.c b/test_domain_create_new.c
index d1b488339f7c7af02627ba03ba52a61c73c027c9..163b19b8a8dcfd16477837b42fa8b0e160a01bd1 100644 (file)
--- a/test_domain_create_new.c
+++ b/test_domain_create_new.c
@@ -31,10 +31,10 @@ void *testcase(struct test *tc)
     libxl_domain_config dc;
 
     init_domain_config(&dc, "test_domain_create_new",
-                       "/root/vmlinuz-4.0.4-301.fc22.x86_64",
-                       "/root/initrd.xen-4.0.4-301.fc22.x86_64",
-                       "/root/Fedora-Cloud-Base-22-20150521.x86_64.qcow2",
-                       "/root/cloudinit.iso");
+                       "resources/vmlinuz-4.0.4-301.fc22.x86_64",
+                       "resources/initrd.xen-4.0.4-301.fc22.x86_64",
+                       "resources/Fedora-Cloud-Base-22-20150521.x86_64.qcow2",
+                       "resources/cloudinit.iso");
 
     for (count = 1; count < 100; count++) {
         uint32_t domid;

diff --git a/test_domain_suspend.c b/test_domain_suspend.c
index 3d74436a21679c84723e20050f4c70840971f097..0075577b562784b05248277bc9fd141adcb6330b 100644 (file)
--- a/test_domain_suspend.c
+++ b/test_domain_suspend.c
@@ -14,10 +14,10 @@ void *testcase(struct test *tc)
     printf("thread started\n");
 
     init_domain_config(&dc, "test_domain_suspend",
-                       "/root/vmlinuz-4.0.4-301.fc22.x86_64",
-                       "/root/initrd.xen-4.0.4-301.fc22.x86_64",
-                       "/root/Fedora-Cloud-Base-22-20150521.x86_64.qcow2",
-                       "/root/init.iso");
+                       "resources/vmlinuz-4.0.4-301.fc22.x86_64",
+                       "resources/initrd.xen-4.0.4-301.fc22.x86_64",
+                       "resources/Fedora-Cloud-Base-22-20150521.x86_64.qcow2",
+                       "resources/cloudinit.iso");
     do_domain_create(tc, &dc, &domid);
 
     wait_for(tc, EV_LIBXL_CALLBACK, &ev);