X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=installcheck%2FMakefile.am;h=3192c51c56f2f06729b47d3d472505ed47f1d600;hb=691567b16c13087b31ee4c2b6d038e57872fae82;hp=bb3e938d9c43d372d204bf1ce86c01e424191f34;hpb=6ba576375c19b829b2a13dbe6562eedd2716b9ea;p=debian%2Famanda

diff --git a/installcheck/Makefile.am b/installcheck/Makefile.am
index bb3e938..3192c51 100644
--- a/installcheck/Makefile.am
+++ b/installcheck/Makefile.am
@@ -1,59 +1,243 @@
-# Note that this architecture assumes a full install -- not just server
-# or just client.  Neither is sufficiently test-able on its own.
-
 include $(top_srcdir)/config/automake/vars.am
 include $(top_srcdir)/config/automake/scripts.am
-
-# Add your tests here.
+all_tests =
 
 common_tests = \
+	Amanda_Archive \
 	Amanda_Config \
-	Amanda_Types
+	Amanda_Config_FoldingHash \
+	Amanda_ClientService \
+	Amanda_Debug \
+	Amanda_Feature \
+	Amanda_IPC_Binary \
+	Amanda_IPC_LineProtocol \
+	Amanda_MainLoop \
+	Amanda_Header \
+	Amanda_Util \
+	Amanda_Xfer \
+	amarchiver \
+	gnutar
+all_tests += $(common_tests)
+
+client_tests = \
+        noop \
+	amgtar \
+	ampgsql \
+	amraw
+all_tests += $(client_tests)
 
 server_tests = \
 	Amanda_Changer \
+	Amanda_Changer_compat \
+	Amanda_Changer_disk \
+	Amanda_Changer_multi \
+	Amanda_Changer_null \
+	Amanda_Changer_rait \
+	Amanda_Changer_robot \
+	Amanda_Changer_single \
 	Amanda_Cmdline \
+	Amanda_Curinfo \
+	Amanda_Disklist \
+	Amanda_DB_Catalog \
+	Amanda_Device \
+	Amanda_Holding \
 	Amanda_Logfile \
+	Amanda_Process \
+	Amanda_Recovery_Clerk \
+	Amanda_Recovery_Planner \
+	Amanda_Recovery_Scan \
+	Amanda_Report \
+	Amanda_Tapelist \
+	Amanda_Taper_Scan \
+	Amanda_Taper_Scan_lexical \
+	Amanda_Taper_Scan_oldest \
+	Amanda_Taper_Scan_traditional \
+	Amanda_Taper_Scribe \
+	bigint \
+	taper \
+	amcheck-device \
+	amgetconf \
+        amtape \
+        amlabel \
+	amtapetype \
+	chunker
+all_tests += $(server_tests)
+
+full_tests = \
+	=setupcache \
+	amadmin \
+	amcheck \
 	amcheckdump \
 	amdevcheck \
-	amgetconf
+	amdump \
+	amdump_client \
+	amflush \
+	amoverview \
+	amreport \
+	amrmtape \
+	amserverconfig \
+	amservice \
+	amstatus \
+	amvault \
+	example \
+	pp-scripts
+all_tests += $(full_tests)
+
+restore_tests = \
+	amfetchdump \
+	amidxtaped \
+	amrestore
+all_tests += $(restore_tests)
+
+restore_tests_no_check_userid = \
+	amrecover
+all_tests += $(restore_tests_no_check_userid)
+
+ndmp_tests = \
+	Amanda_Changer_ndmp \
+	Amanda_NDMP
+all_tests += $(ndmp_tests)
+
+mock_tests = \
+	mock_mtx
+all_tests += $(mock_tests)
 
-tests = $(common_tests)
+# mock scripts
+mocks = \
+	mock/mail \
+	mock/mtx \
+	mock/lpr
+
+# data for test scripts
+test_data = \
+	data/aws-bundle.crt
+EXTRA_DIST += $(test_data)
+
+tests =
+
+# tests requiring neither client nor server
+tests += $(common_tests)
+tests += $(mock_tests)
+
+# tests requiring server
 if WANT_SERVER
 tests += $(server_tests)
 endif
 
-# Add any common files (that should not be run as tests) here:
-test_utils = Amconfig.pm
+# tests requiring client
+if WANT_CLIENT
+tests += $(client_tests)
+endif
+
+# tests requiring a client and a server AND restore facilities (any tests that run amdump)
+if WANT_SERVER
+if WANT_CLIENT
+# tests requiring a client and a server (any tests that run amdump)
+tests += $(full_tests)
+
+# tests requiring a client, a server, *and* restore code
+if WANT_RESTORE
+tests += $(restore_tests)
+
+# and tests requiring all that *and* requiring CHECK_USERID is not set
+if !CHECK_USERID
+tests += $(restore_tests_no_check_userid)
+endif
+endif
+endif
+endif
+
+# tests that need a server with NDMP support
+if WANT_NDMP
+if WANT_SERVER
+tests += $(ndmp_tests)
+endif
+endif
+
+# Add any common files (that should not be run as tests, and that do not
+# require configure-variable substitution) here:
+test_utils = \
+	Installcheck.pm \
+	Installcheck/Catalogs.pm \
+	Installcheck/Config.pm \
+	Installcheck/ClientService.pm \
+	Installcheck/Mock.pm \
+	Installcheck/Run.pm \
+	Installcheck/Dumpcache.pm \
+	Installcheck/Application.pm \
+	Installcheck/Changer.pm
+EXTRA_DIST += $(test_utils)
+
+# the catalogs themselves
+catalogs = \
+	catalogs/amflush.cat \
+	catalogs/bigdb.cat \
+	catalogs/bigestimate.cat \
+	catalogs/chunker-partial.cat \
+	catalogs/doublefailure.cat \
+	catalogs/fatal.cat \
+	catalogs/filesystemstaped.cat \
+	catalogs/flush-noorigsize.cat \
+	catalogs/flush-origsize.cat \
+	catalogs/longstrange.cat \
+	catalogs/multi-taper.cat \
+	catalogs/normal.cat \
+	catalogs/plannerfail.cat \
+	catalogs/quoted.cat \
+	catalogs/resultsmissing.cat \
+	catalogs/retried.cat \
+	catalogs/retried-nofinish.cat \
+	catalogs/retried-strange.cat \
+	catalogs/shortstrange.cat \
+	catalogs/skipped.cat \
+	catalogs/spanned.cat \
+	catalogs/strontium.cat \
+	catalogs/taperr.cat \
+	catalogs/taper-parallel-write.cat
+EXTRA_DIST += $(catalogs)
+
 
-SCRIPTS_PERL = $(common_tests) $(server_tests) $(test_utils)
+# and finally some development utilities
+noinst_SCRIPTS = \
+	run-ndmp
 
-# we don't need to syntax check the test scripts..
-CHECK_PERL =
+CHECK_PERL_FLAGS=-I$(top_srcdir)/installcheck
+
+SCRIPTS_PERL = $(tests) $(mocks) $(noinst_SCRIPTS)
+SCRIPTS_EXTRA_DIST = $(all_tests)
+
+# skip syntax checks on these files, since we're about to run all of them
+SKIP_CHECKS = yes
 
 .PHONY: clobber_my_config_is_ok
 clobber_my_config_is_ok:
-	@if test "$(CLOBBER_MY_CONFIG)" != "OK"; then \
+	@if test "$(CONFIG_CLOBBER_MY_CONFIG)" != "OK" -a \
+                 "$(CLOBBER_MY_CONFIG)" != "OK"; then \
 		echo ""; \
 		echo "'make installcheck' is a dangerous tool.  It will overwrite your"; \
-		echo "amanda-client.conf and amandates, and (if it"; \
-		echo "triggers an as-yet undetected bug) may do other unexpected things.  You are"; \
-		echo "strongly encouraged"; \
- 		echo "  - not to run installchecks on a production install"; \
- 		echo "  - not to run installchecks as root"; \
+		echo "amanda-client.conf and amandates, and (if it triggers an as-yet undetected"; \
+		echo "bug) may do other unexpected things.  You are strongly encouraged"; \
+		echo "  - not to run installchecks on a production install"; \
+		echo "  - not to run installchecks as root"; \
 		echo "See http://wiki.zmanda.com/index.php/Testing for instructions on setting up a"; \
-		echo "test environment in which"; \
-		echo "potential damage is limited by your filesystem's permissions.  To actually run"; \
-		echo "the installchecks, invoke make"; \
-		echo "as follows:"; \
-  		echo "  $(MAKE) CLOBBER_MY_CONFIG=OK installcheck"; \
+		echo "test environment in which potential damage is limited by your filesystem's"; \
+		echo "permissions.  To actually run the installchecks, invoke make as follows:"; \
+		echo "  $(MAKE) CLOBBER_MY_CONFIG=OK installcheck"; \
 		exit 1; \
 	fi
 
+# newer Test::Harness (v3.18-3.21) implementations get confused by executable
+# test scripts, so this rule chmod a-x's them first
 installcheck-local: clobber_my_config_is_ok $(SCRIPTS_PERL)
-	$(mkdir_p) $(AMANDA_TMPDIR)
-	$(PERL) -I$(srcdir) -I$(builddir) -e 'use Test::Harness qw(&runtests); runtests(@ARGV);' $(tests)
+	rm -rf "$(AMANDA_TMPDIR)/installchecks"
+	$(mkdir_p) "$(AMANDA_TMPDIR)/installchecks"
+	@if test -f "$(CONFIG_DIR)/amanda-client.conf" -a ! -f "$(CONFIG_DIR)/amanda-client.conf.install-backup"; then \
+	    cp "$(CONFIG_DIR)/amanda-client.conf" "$(CONFIG_DIR)/amanda-client.conf.install-backup"; \
+	fi
+	for f in $(tests); do chmod a-x $$f; done
+	srcdir="$(srcdir)" $(PERL) -I$(srcdir) -I. -e 'use Test::Harness qw(&runtests); runtests(sort @ARGV);' $(tests)
 	rm -rf "$(CONFIG_DIR)/TESTCONF"
-	rm -rf "$(CONFIG_DIR)/amanda-client.conf"
-	rm -rf "$(DEFAULT_AMANDATES_FILE)"
-	rm -rf "$(GNUTAR_LISTED_INCREMENTAL_DIR)"
+	@if test -f "$(CONFIG_DIR)/amanda-client.conf.install-backup"; then \
+	    mv -f "$(CONFIG_DIR)/amanda-client.conf.install-backup" "$(CONFIG_DIR)/amanda-client.conf"; \
+	fi
+	rm -rf "$(AMANDA_TMPDIR)/installchecks"