[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Libguestfs] [PATCH 1/3] tests: Rename test-data/test-utils.sh -> tests/test-functions.sh.



This is pure code motion.
---
 Makefile.am                                        | 1 +
 test-data/Makefile.am                              | 3 ---
 tests/qemu/qemu-liveness.sh                        | 2 +-
 tests/qemu/qemu-snapshot-isolation.sh              | 2 +-
 test-data/test-utils.sh => tests/test-functions.sh | 0
 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-tar.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 +-
 12 files changed, 10 insertions(+), 12 deletions(-)
 rename test-data/test-utils.sh => tests/test-functions.sh (100%)

diff --git a/Makefile.am b/Makefile.am
index ac472d7..7250cae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -240,6 +240,7 @@ EXTRA_DIST = \
 	ocaml-link.sh \
 	podcheck.pl \
 	tests/automake2junit.ml \
+	tests/test-functions.sh \
 	tmp/.gitignore \
 	update-bugs.sh \
 	utils/README \
diff --git a/test-data/Makefile.am b/test-data/Makefile.am
index 9963f58..3c07188 100644
--- a/test-data/Makefile.am
+++ b/test-data/Makefile.am
@@ -26,9 +26,6 @@ SUBDIRS += fake-virtio-win fake-virt-tools
 SUBDIRS += files
 SUBDIRS += .
 
-EXTRA_DIST = \
-        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
 # tests.
diff --git a/tests/qemu/qemu-liveness.sh b/tests/qemu/qemu-liveness.sh
index ee22b66..6f59da7 100755
--- a/tests/qemu/qemu-liveness.sh
+++ b/tests/qemu/qemu-liveness.sh
@@ -22,7 +22,7 @@
 
 set -e
 
-. $srcdir/../../test-data/test-utils.sh
+. $srcdir/../../tests/test-functions.sh
 
 rm -f liveness1.img
 
diff --git a/tests/qemu/qemu-snapshot-isolation.sh b/tests/qemu/qemu-snapshot-isolation.sh
index 78cc69c..e062328 100755
--- a/tests/qemu/qemu-snapshot-isolation.sh
+++ b/tests/qemu/qemu-snapshot-isolation.sh
@@ -22,7 +22,7 @@
 
 set -e
 
-. $srcdir/../../test-data/test-utils.sh
+. $srcdir/../../tests/test-functions.sh
 
 # UML backend doesn't support qcow2 format.
 supports_qcow2=yes
diff --git a/test-data/test-utils.sh b/tests/test-functions.sh
similarity index 100%
rename from test-data/test-utils.sh
rename to tests/test-functions.sh
diff --git a/v2v/test-v2v-i-ova-formats.sh b/v2v/test-v2v-i-ova-formats.sh
index dccf574..4c60de2 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/test-utils.sh
+. $srcdir/../tests/test-functions.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 32ffff8..33a98f3 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/test-utils.sh
+. $srcdir/../tests/test-functions.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 34dcd99..d1e12f9 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/test-utils.sh
+. $srcdir/../tests/test-functions.sh
 
 d=test-v2v-i-ova-subfolders.d
 rm -rf $d
diff --git a/v2v/test-v2v-i-ova-tar.sh b/v2v/test-v2v-i-ova-tar.sh
index 99988f4..dc3838b 100755
--- a/v2v/test-v2v-i-ova-tar.sh
+++ b/v2v/test-v2v-i-ova-tar.sh
@@ -34,7 +34,7 @@ fi
 
 export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools"
 
-. $srcdir/../test-data/test-utils.sh
+. $srcdir/../tests/test-functions.sh
 
 d=test-v2v-i-ova-tar.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 f02e8f2..bbc2df0 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/test-utils.sh
+. $srcdir/../tests/test-functions.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 37c99bc..3f426c4 100755
--- a/v2v/test-v2v-i-ova.sh
+++ b/v2v/test-v2v-i-ova.sh
@@ -48,7 +48,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/test-utils.sh
+. $srcdir/../tests/test-functions.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 9424b7f..c49b9b5 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/test-utils.sh
+. $srcdir/../tests/test-functions.sh
 
 d=$PWD/test-v2v-in-place.d
 rm -rf $d
-- 
2.9.3


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]