Move pure regression tests to their own subdirectory.

diff --git a/HACKING b/HACKING
index 390e4a4..fc9ed38 100644 (file)
--- a/HACKING
+++ b/HACKING
@@ -79,6 +79,9 @@ perl/
 python/
        Python bindings.
 
 python/
        Python bindings.
 

+regressions/
+       Regression tests.
+

 ruby/
        Ruby bindings.
 
 ruby/
        Ruby bindings.
 

diff --git a/Makefile.am b/Makefile.am
index 9e44813..53e0910 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,8 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
 
 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
 
 if HAVE_OCAML
 SUBDIRS += ocaml

diff --git a/capitests/Makefile.am b/capitests/Makefile.am
index f061243..18e49a3 100644 (file)
--- a/capitests/Makefile.am
+++ b/capitests/Makefile.am
@@ -16,9 +16,7 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 EXTRA_DIST = \
 # 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.
 
 # 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
 
        -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) \
 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/configure.ac b/configure.ac
index 67f05aa..1b09eb9 100644 (file)
--- 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
                 appliance/make-initramfs.sh appliance/update-initramfs.sh
                 images/Makefile
                 capitests/Makefile

+                regressions/Makefile

                 ocaml/Makefile ocaml/examples/Makefile
                 perl/Makefile
                 python/Makefile
                 ocaml/Makefile ocaml/examples/Makefile
                 perl/Makefile
                 python/Makefile

diff --git a/regressions/Makefile.am b/regressions/Makefile.am
new file mode 100644 (file)
index 0000000..fd56a6d
--- /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/capitests/test-bootbootboot.sh b/regressions/test-bootbootboot.sh
similarity index 100%
rename from capitests/test-bootbootboot.sh
rename to regressions/test-bootbootboot.sh

diff --git a/capitests/test-cleanup.sh b/regressions/test-cleanup.sh
similarity index 100%
rename from capitests/test-cleanup.sh
rename to regressions/test-cleanup.sh