From dcd8742578a57e0871d6db4797014bbfd854a57b Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Thu, 4 Jun 2009 14:09:00 +0100 Subject: Move pure regression tests to their own subdirectory. --- capitests/Makefile.am | 6 ++---- capitests/test-bootbootboot.sh | 42 ------------------------------------------ capitests/test-cleanup.sh | 33 --------------------------------- 3 files changed, 2 insertions(+), 79 deletions(-) delete mode 100755 capitests/test-bootbootboot.sh delete mode 100755 capitests/test-cleanup.sh (limited to 'capitests') 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 <