From dcd8742578a57e0871d6db4797014bbfd854a57b Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones@trick.home.annexia.org>
Date: Thu, 4 Jun 2009 14:09:00 +0100
Subject: Move pure regression tests to their own subdirectory.

---
 HACKING                          |  3 +++
 Makefile.am                      |  3 ++-
 capitests/Makefile.am            |  6 ++----
 capitests/test-bootbootboot.sh   | 42 ----------------------------------------
 capitests/test-cleanup.sh        | 33 -------------------------------
 configure.ac                     |  1 +
 regressions/Makefile.am          | 28 +++++++++++++++++++++++++++
 regressions/test-bootbootboot.sh | 42 ++++++++++++++++++++++++++++++++++++++++
 regressions/test-cleanup.sh      | 33 +++++++++++++++++++++++++++++++
 9 files changed, 111 insertions(+), 80 deletions(-)
 delete mode 100755 capitests/test-bootbootboot.sh
 delete mode 100755 capitests/test-cleanup.sh
 create mode 100644 regressions/Makefile.am
 create mode 100755 regressions/test-bootbootboot.sh
 create mode 100755 regressions/test-cleanup.sh

diff --git a/HACKING b/HACKING
index 390e4a4f..fc9ed382 100644
--- a/HACKING
+++ b/HACKING
@@ -79,6 +79,9 @@ perl/
 python/
 	Python bindings.
 
+regressions/
+	Regression tests.
+
 ruby/
 	Ruby bindings.
 
diff --git a/Makefile.am b/Makefile.am
index 9e448139..53e09108 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,8 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src daemon appliance fish po examples images capitests
+SUBDIRS = src daemon appliance fish po examples images \
+	capitests regressions
 
 if HAVE_OCAML
 SUBDIRS += ocaml
diff --git a/capitests/Makefile.am b/capitests/Makefile.am
index f061243b..18e49a3f 100644
--- a/capitests/Makefile.am
+++ b/capitests/Makefile.am
@@ -16,9 +16,7 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 EXTRA_DIST = \
-	tests.c \
-	test-cleanup.sh \
-	test-bootbootboot.sh
+	tests.c
 
 # Tests.  These are auto-generated from the test descriptions
 # in the generator.
@@ -30,7 +28,7 @@ tests_CFLAGS = \
 	-I$(top_builddir)/src -Wall
 tests_LDADD = $(top_builddir)/src/libguestfs.la
 
-TESTS = tests test-bootbootboot.sh
+TESTS = tests
 TESTS_ENVIRONMENT = \
 	SKIP_TEST_COMMAND=$(shell ldd test-command | grep -sq 'not a dynamic executable' || echo 1) \
 	SKIP_TEST_COMMAND_LINES=$(shell ldd test-command | grep -sq 'not a dynamic executable' || echo 1) \
diff --git a/capitests/test-bootbootboot.sh b/capitests/test-bootbootboot.sh
deleted file mode 100755
index 05ff6dfe..00000000
--- a/capitests/test-bootbootboot.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh -
-# libguestfs
-# Copyright (C) 2009 Red Hat Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-# Some versions of qemu can be flakey and can hang occasionally
-# during boot (particularly KVM if the BIOS is the qemu version
-# which doesn't have the required KVM patches).  Test repeatedly
-# booting.
-
-set -e
-
-rm -f test1.img
-dd if=/dev/zero of=test1.img bs=1024k count=500
-
-n=10
-if [ -n "$1" ]; then n=$1; fi
-
-export LIBGUESTFS_DEBUG=1
-export LIBGUESTFS_PATH=../appliance
-
-for i in $(seq 1 $n); do
-  echo Test boot $i of $n ...
-  ../fish/guestfish -a test1.img run
-done
-
-rm test1.img
-
-echo Test boot completed after $n iterations.
diff --git a/capitests/test-cleanup.sh b/capitests/test-cleanup.sh
deleted file mode 100755
index 33194ab2..00000000
--- a/capitests/test-cleanup.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh -
-# libguestfs
-# Copyright (C) 2009 Red Hat Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-# XXX Unfortunately we can't enable this by default since it
-# requires './configure --enable-debug-command'
-
-./fish/guestfish <<EOF
-alloc /tmp/test.img 100M
-run
-
-# Force a segfault inside the daemon.
--debug segv ''
-
-# We should now be able to rerun the subprocess.
-run
-ping-daemon
-EOF
-  
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index 67f05aae..1b09eb9e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -455,6 +455,7 @@ AC_CONFIG_FILES([Makefile
 	         appliance/make-initramfs.sh appliance/update-initramfs.sh
 		 images/Makefile
 		 capitests/Makefile
+		 regressions/Makefile
 		 ocaml/Makefile ocaml/examples/Makefile
 		 perl/Makefile
 		 python/Makefile
diff --git a/regressions/Makefile.am b/regressions/Makefile.am
new file mode 100644
index 00000000..fd56a6d0
--- /dev/null
+++ b/regressions/Makefile.am
@@ -0,0 +1,28 @@
+# libguestfs
+# Copyright (C) 2009 Red Hat Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+# Regression tests and other important tests which are not
+# specific to the C API.  We can write these more easily in
+# higher level languages than C.
+#
+# See also capitests/
+
+EXTRA_DIST = \
+	test-cleanup.sh \
+	test-bootbootboot.sh
+
+TESTS = test-bootbootboot.sh
diff --git a/regressions/test-bootbootboot.sh b/regressions/test-bootbootboot.sh
new file mode 100755
index 00000000..05ff6dfe
--- /dev/null
+++ b/regressions/test-bootbootboot.sh
@@ -0,0 +1,42 @@
+#!/bin/sh -
+# libguestfs
+# Copyright (C) 2009 Red Hat Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+# Some versions of qemu can be flakey and can hang occasionally
+# during boot (particularly KVM if the BIOS is the qemu version
+# which doesn't have the required KVM patches).  Test repeatedly
+# booting.
+
+set -e
+
+rm -f test1.img
+dd if=/dev/zero of=test1.img bs=1024k count=500
+
+n=10
+if [ -n "$1" ]; then n=$1; fi
+
+export LIBGUESTFS_DEBUG=1
+export LIBGUESTFS_PATH=../appliance
+
+for i in $(seq 1 $n); do
+  echo Test boot $i of $n ...
+  ../fish/guestfish -a test1.img run
+done
+
+rm test1.img
+
+echo Test boot completed after $n iterations.
diff --git a/regressions/test-cleanup.sh b/regressions/test-cleanup.sh
new file mode 100755
index 00000000..33194ab2
--- /dev/null
+++ b/regressions/test-cleanup.sh
@@ -0,0 +1,33 @@
+#!/bin/sh -
+# libguestfs
+# Copyright (C) 2009 Red Hat Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+# XXX Unfortunately we can't enable this by default since it
+# requires './configure --enable-debug-command'
+
+./fish/guestfish <<EOF
+alloc /tmp/test.img 100M
+run
+
+# Force a segfault inside the daemon.
+-debug segv ''
+
+# We should now be able to rerun the subprocess.
+run
+ping-daemon
+EOF
+  
\ No newline at end of file
-- 
cgit