10:13 a.m.
Signed-off-by: Tomáš Golembiovský <tgolembi(a)redhat.com>
---
test-data/Makefile.am | 2 +-
test-data/{guestfs-hashsums.sh => test-utils.sh} | 0
tests/qemu/qemu-liveness.sh | 2 +-
tests/qemu/qemu-snapshot-isolation.sh | 2 +-
v2v/test-v2v-i-ova-formats.sh | 2 +-
v2v/test-v2v-i-ova-gz.sh | 2 +-
v2v/test-v2v-i-ova-subfolders.sh | 2 +-
v2v/test-v2v-i-ova-two-disks.sh | 2 +-
v2v/test-v2v-i-ova.sh | 2 +-
v2v/test-v2v-in-place.sh | 2 +-
10 files changed, 9 insertions(+), 9 deletions(-)
rename test-data/{guestfs-hashsums.sh => test-utils.sh} (100%)
diff --git a/test-data/Makefile.am b/test-data/Makefile.am
index 86cd5a2..4ac4c91 100644
--- a/test-data/Makefile.am
+++ b/test-data/Makefile.am
@@ -27,7 +27,7 @@ SUBDIRS += files
SUBDIRS += .
EXTRA_DIST = \
- guestfs-hashsums.sh
+ test-utils.sh
# Build an ISO containing various files from the subdirectories, which
# is used by tests/c-api and a few guestfish tests and regression
diff --git a/test-data/guestfs-hashsums.sh b/test-data/test-utils.sh
similarity index 100%
rename from test-data/guestfs-hashsums.sh
rename to test-data/test-utils.sh
diff --git a/tests/qemu/qemu-liveness.sh b/tests/qemu/qemu-liveness.sh
index fda3cc2..ee22b66 100755
--- a/tests/qemu/qemu-liveness.sh
+++ b/tests/qemu/qemu-liveness.sh
@@ -22,7 +22,7 @@
set -e
-. $srcdir/../../test-data/guestfs-hashsums.sh
+. $srcdir/../../test-data/test-utils.sh
rm -f liveness1.img
diff --git a/tests/qemu/qemu-snapshot-isolation.sh
b/tests/qemu/qemu-snapshot-isolation.sh
index 4d60e59..78cc69c 100755
--- a/tests/qemu/qemu-snapshot-isolation.sh
+++ b/tests/qemu/qemu-snapshot-isolation.sh
@@ -22,7 +22,7 @@
set -e
-. $srcdir/../../test-data/guestfs-hashsums.sh
+. $srcdir/../../test-data/test-utils.sh
# UML backend doesn't support qcow2 format.
supports_qcow2=yes
diff --git a/v2v/test-v2v-i-ova-formats.sh b/v2v/test-v2v-i-ova-formats.sh
index d113994..3105c62 100755
--- a/v2v/test-v2v-i-ova-formats.sh
+++ b/v2v/test-v2v-i-ova-formats.sh
@@ -46,7 +46,7 @@ fi
export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools"
-. $srcdir/../test-data/guestfs-hashsums.sh
+. $srcdir/../test-data/test-utils.sh
d=test-v2v-i-ova-formats.d
rm -rf $d
diff --git a/v2v/test-v2v-i-ova-gz.sh b/v2v/test-v2v-i-ova-gz.sh
index a38e1b4..e394ed7 100755
--- a/v2v/test-v2v-i-ova-gz.sh
+++ b/v2v/test-v2v-i-ova-gz.sh
@@ -34,7 +34,7 @@ fi
export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools"
-. $srcdir/../test-data/guestfs-hashsums.sh
+. $srcdir/../test-data/test-utils.sh
d=test-v2v-i-ova-gz.d
rm -rf $d
diff --git a/v2v/test-v2v-i-ova-subfolders.sh b/v2v/test-v2v-i-ova-subfolders.sh
index c49f7cb..4fd1ace 100755
--- a/v2v/test-v2v-i-ova-subfolders.sh
+++ b/v2v/test-v2v-i-ova-subfolders.sh
@@ -34,7 +34,7 @@ fi
export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools"
-. $srcdir/../test-data/guestfs-hashsums.sh
+. $srcdir/../test-data/test-utils.sh
d=test-v2v-i-ova-subfolders.d
rm -rf $d
diff --git a/v2v/test-v2v-i-ova-two-disks.sh b/v2v/test-v2v-i-ova-two-disks.sh
index aefd90e..a6ca671 100755
--- a/v2v/test-v2v-i-ova-two-disks.sh
+++ b/v2v/test-v2v-i-ova-two-disks.sh
@@ -35,7 +35,7 @@ fi
export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools"
export VIRTIO_WIN="$srcdir/../test-data/fake-virtio-win"
-. $srcdir/../test-data/guestfs-hashsums.sh
+. $srcdir/../test-data/test-utils.sh
d=test-v2v-i-ova-two-disks.d
rm -rf $d
diff --git a/v2v/test-v2v-i-ova.sh b/v2v/test-v2v-i-ova.sh
index 716cd33..3c93c63 100755
--- a/v2v/test-v2v-i-ova.sh
+++ b/v2v/test-v2v-i-ova.sh
@@ -41,7 +41,7 @@ fi
export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools"
export VIRTIO_WIN="$srcdir/../test-data/fake-virtio-win"
-. $srcdir/../test-data/guestfs-hashsums.sh
+. $srcdir/../test-data/test-utils.sh
d=test-v2v-i-ova.d
rm -rf $d
diff --git a/v2v/test-v2v-in-place.sh b/v2v/test-v2v-in-place.sh
index 444790c..9424b7f 100755
--- a/v2v/test-v2v-in-place.sh
+++ b/v2v/test-v2v-in-place.sh
@@ -44,7 +44,7 @@ fi
export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools"
export VIRTIO_WIN="$srcdir/../test-data/fake-virtio-win"
-. $srcdir/../test-data/guestfs-hashsums.sh
+. $srcdir/../test-data/test-utils.sh
d=$PWD/test-v2v-in-place.d
rm -rf $d
--
2.10.2