Tuning the tests: more, and do update if required

5 files changed, 58 insertions, 32 deletions

diff --git a/test/Makefile.am b/test/Makefile.am
index 7905491..9c2c00e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -12,7 +12,7 @@ TESTCASES += nbb-automake.at
 
 EXTRA_DIST += $(TESTCASES)
 
-TESTSUITE_NAME = general-foo
+TESTSUITE_NAME = nbb-foo
 TESTSUITE_COPYRIGHT = Copyright (C) 2007, 2008 Hans Ulrich Niedermann
 TESTED_EXECUTABLES = git bzr
 TESTSUITE = testsuite
@@ -31,6 +31,7 @@ git-version-check:
 	cd $(top_builddir) && $(MAKE) git-version-check
 
 check-local: git-version-check atconfig atlocal $(srcdir)/$(TESTSUITE)
+	@echo "INFO: Running uninstalled test suite"; \
 	abs_top_builddir="$$(cd "$(top_builddir)" > /dev/null 2>&1 && pwd)"; \
 	abs_top_srcdir="$$(cd "$(top_srcdir)" > /dev/null 2>&1 && pwd)"; \
 	$(SHELL) "$(srcdir)/$(TESTSUITE)" AUTOTEST_PATH=`cd $(top_builddir)/src > /dev/null && pwd` \
@@ -38,6 +39,7 @@ check-local: git-version-check atconfig atlocal $(srcdir)/$(TESTSUITE)
 		$(TESTSUITEFLAGS)
 
 installcheck-local: atconfig atlocal $(srcdir)/$(TESTSUITE)
+	@echo "INFO: Running installed test suite"; \
 	$(SHELL) "$(srcdir)/$(TESTSUITE)" AUTOTEST_PATH='$(bindir)' \
 		PYTHONPATH="$(DESTDIR)$(pythondir)" \
 		$(TESTSUITEFLAGS)
@@ -64,6 +66,7 @@ clean-local:
 # does not imply an addition to TESTCASES.
 EXTRA_DIST += $(srcdir)/testsuite.at
 $(srcdir)/testsuite.at: $(TESTCASES) Makefile.in
+	@:; echo "INFO: Checking $(srcdir)/testsuite.at is up to date"; \
 	{ \
 		echo "dnl testsuite.at autogenerated from tests/Makefile.am"; \
 		echo "AT_INIT()"; : "([$(TESTSUITE_NAME)])"; \
@@ -74,21 +77,29 @@ $(srcdir)/testsuite.at: $(TESTCASES) Makefile.in
 		for tc in $(TESTCASES); do \
 			echo "m4_include([$${tc}])"; \
 		done; \
-	} > $(srcdir)/testsuite.at
+	} > testsuite.at.new
+	@if test -f $(srcdir)/testsuite.at \
+	 && cmp testsuite.at.new $(srcdir)/testsuite.at; \
+	then rm -f testsuite.at.new; \
+	else echo "INFO: Updating $(srcdir)/testsuite.at"; \
+	     mv -f testsuite.at.new $(srcdir)/testsuite.at; fi
 
 # FIXME: Hack to handle unset AUTOM4TE variable
 EXTRA_DIST += $(srcdir)/$(TESTSUITE)
-$(srcdir)/$(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/local.at $(srcdir)/package.m4
+$(srcdir)/$(TESTSUITE): testsuite.at local.at package.m4 $(TESTCASES)
+	@echo "INFO: Checking whether $(srcdir)/$(TESTSUITE) is up to date"; \
 	AUTOM4TE="$(AUTOM4TE)"; \
 	if test "x$${AUTOM4TE}" = "x"; then AUTOM4TE="autom4te"; fi; \
 	$${AUTOM4TE} --language=autotest -I '$(srcdir)' -o $(TESTSUITE).tmp $(srcdir)/testsuite.at
-	if test -f $(srcdir)/$(TESTSUITE) && cmp $(TESTSUITE).tmp $(srcdir)/$(TESTSUITE); \
+	@if test -f $(srcdir)/$(TESTSUITE) && cmp $(TESTSUITE).tmp $(srcdir)/$(TESTSUITE); \
 	then rm -f $(TESTSUITE).tmp; \
-	else mv -f $(TESTSUITE).tmp $(srcdir)/$(TESTSUITE); fi
+	else echo "INFO: Updating $(srcdir)/$(TESTSUITE)"; \
+	     mv -f $(TESTSUITE).tmp $(srcdir)/$(TESTSUITE); fi
 
 EXTRA_DIST += $(srcdir)/package.m4
 $(srcdir)/package.m4: $(top_srcdir)/configure.ac $(top_builddir)/config.status Makefile.in
-	:; { \
+	@:;  echo "INFO: Checking $(srcdir)/package.m4 is up to date"; \
+	{ \
 		echo '# Signature of the current package (generated by tests/Makefile.am).'; \
 		echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
 		echo 'm4_define([AT_PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
@@ -96,9 +107,10 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac $(top_builddir)/config.status M
 		echo 'm4_define([AT_PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
 		echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
 	} > package.m4.tmp
-	if test -f $(srcdir)/package.m4 && cmp package.m4.tmp $(srcdir)/package.m4; \
+	@if test -f $(srcdir)/package.m4 && cmp package.m4.tmp $(srcdir)/package.m4; \
 	then rm -f package.m4.tmp; \
-	else mv -f package.m4.tmp $(srcdir)/package.m4; fi
+	else echo "INFO: Updating $(srcdir)/package.m4"; \
+	     mv -f package.m4.tmp $(srcdir)/package.m4; fi
 
 dist-hook:
 	$(MAKE) $(srcdir)/package.m4 $(srcdir)/$(TESTSUITE)
diff --git a/test/local.at b/test/local.at
index 369978f..0b2a309 100644
--- a/test/local.at
+++ b/test/local.at
@@ -18,6 +18,7 @@ AC[_]CONFIG_FILES(@<:@Makefile@:>@)
 AC[_]OUTPUT
 ])dnl
 AT_DATA([test.git/Makefile.am], [dnl
+TESTS = foobar
 bin_PROGRAMS = foobar
 foobar_SOURCES = foobar.c
 ])dnl
diff --git a/test/nbb-automake.at b/test/nbb-automake.at
index 1170b0c..6093202 100644
--- a/test/nbb-automake.at
+++ b/test/nbb-automake.at
@@ -5,7 +5,7 @@ AT_TESTED([nbb])
 
 dnl ===================================================================
 
-AT_SETUP([nbb: init])
+AT_SETUP([nbb automake: init])
 AT_KEYWORDS([nbb init])
 AT_CREATE_GIT_AM()
 AT_CHECK([cd test.git && nbb init], [0], [ignore], [ignore])
@@ -14,7 +14,7 @@ AT_CLEANUP()
 
 dnl ===================================================================
 
-AT_SETUP([nbb: configure])
+AT_SETUP([nbb automake: configure])
 AT_KEYWORDS([nbb configure])
 AT_CREATE_GIT_AM()
 AT_CHECK([cd test.git && nbb configure], [0], [ignore], [ignore])
@@ -23,7 +23,7 @@ AT_CLEANUP()
 
 dnl ===================================================================
 
-AT_SETUP([nbb: build])
+AT_SETUP([nbb automake: build])
 AT_KEYWORDS([nbb build])
 AT_CREATE_GIT_AM()
 AT_CHECK([cd test.git && nbb build], [0], [ignore], [ignore])
@@ -32,7 +32,7 @@ AT_CLEANUP()
 
 dnl ===================================================================
 
-AT_SETUP([nbb: install])
+AT_SETUP([nbb automake: install])
 AT_KEYWORDS([nbb install])
 AT_CREATE_GIT_AM()
 AT_CHECK([cd test.git && nbb install], [0], [ignore], [ignore])
@@ -40,3 +40,13 @@ AT_REMOVE_GIT_AM()
 AT_CLEANUP()
 
 dnl ===================================================================
+
+AT_SETUP([nbb automake: make distcheck])
+AT_KEYWORDS([nbb make distcheck])
+AT_CREATE_GIT_AM()
+AT_CHECK([cd test.git && nbb configure], [0], [ignore], [ignore])
+AT_CHECK([cd test.git && nbb make distcheck], [0], [ignore], [ignore])
+AT_REMOVE_GIT_AM()
+AT_CLEANUP()
+
+dnl ===================================================================
diff --git a/test/nbb-basic.at b/test/nbb-basic.at
index 3af2273..da96a39 100644
--- a/test/nbb-basic.at
+++ b/test/nbb-basic.at
@@ -7,7 +7,7 @@ dnl ===================================================================
 
 dnl ===================================================================
 
-AT_SETUP([nbb: --version option])
+AT_SETUP([nbb basic: --version option])
 AT_KEYWORDS([nbb version])
 AT_CHECK([nbb --version],
 [0],
@@ -15,7 +15,7 @@ AT_CHECK([nbb --version],
 ])
 AT_CLEANUP()
 
-AT_SETUP([nbb: --version package name consistency])
+AT_SETUP([nbb basic: --version package name consistency])
 AT_KEYWORDS([nbb version])
 AT_CHECK([nbb --version | sed 's/^@<:@^(@:>@*(//; s/)@<:@^)@:>@*$//' | sed "s/'//"],
 [0],
@@ -25,22 +25,31 @@ AT_CLEANUP()
 
 dnl ===================================================================
 
-AT_SETUP([nbb: --help option])
+AT_SETUP([nbb basic: --help option])
 AT_KEYWORDS([nbb help])
 AT_CHECK([nbb --help], [0], [ignore], [ignore])
 AT_CLEANUP()
 
 dnl ===================================================================
 
-AT_SETUP([nbb: help command])
+AT_SETUP([nbb basic: no parameters at all])
+AT_KEYWORDS([nbb no parameters])
+AT_CHECK([nbb], [2],
+[Command line error: nbb requires some arguments
+], [])
+AT_CLEANUP()
+
+dnl ===================================================================
+
+AT_SETUP([nbb help: without params])
 AT_KEYWORDS([nbb help])
 AT_CHECK([nbb help], [0], [ignore], [])
 AT_CLEANUP()
 
 dnl ===================================================================
 
-AT_SETUP([nbb: help <command> command])
-AT_KEYWORDS([nbb help])
+AT_SETUP([nbb help: command help])
+AT_KEYWORDS([nbb help command])
 AT_CHECK([dnl
 sep='======================================================================='
 echo "$sep"
@@ -55,7 +64,7 @@ sed -n 's/^\t\([^ \t]\{1,\}\).*/\1/p'
 
 dnl ===================================================================
 
-AT_SETUP([nbb: global option --vcs=git])
+AT_SETUP([nbb global option: --vcs=git])
 AT_KEYWORDS([nbb vcs global])
 AT_CHECK([nbb --vcs=git --version], [0], [dnl
 nbb (ndim's branch builder) AT_PACKAGE_VERSION
@@ -64,7 +73,7 @@ AT_CLEANUP()
 
 dnl ===================================================================
 
-AT_SETUP([nbb: global option --vcs git])
+AT_SETUP([nbb global option: --vcs git])
 AT_KEYWORDS([nbb vcs global])
 AT_CHECK([nbb --vcs git --version], [0], [dnl
 nbb (ndim's branch builder) AT_PACKAGE_VERSION
@@ -73,7 +82,7 @@ AT_CLEANUP()
 
 dnl ===================================================================
 
-AT_SETUP([nbb: global option -v git])
+AT_SETUP([nbb global option: -v git])
 AT_KEYWORDS([nbb vcs global])
 AT_CHECK([nbb -v git --version], [0], [dnl
 nbb (ndim's branch builder) AT_PACKAGE_VERSION
@@ -82,22 +91,20 @@ AT_CLEANUP()
 
 dnl ===================================================================
 
-AT_SETUP([nbb: multiple global option -v git --vcs git])
+AT_SETUP([nbb global option: multiple -v git --vcs git])
 AT_KEYWORDS([nbb vcs global])
 AT_CHECK([nbb -v git --vcs git --version], [1], [ignore], [ignore])
 AT_CLEANUP()
 
 dnl ===================================================================
 
-AT_SETUP([nbb: internal-config command])
+AT_SETUP([nbb internal-config: show internal config])
 AT_KEYWORDS([nbb internal-config])
 AT_CHECK([nbb internal-config], [0], [ignore], [])
 AT_CLEANUP()
 
 dnl ===================================================================
 
-dnl ===================================================================
-
 dnl Local Variables:
 dnl mode: Autoconf
 dnl End:
diff --git a/test/nbb-config.at b/test/nbb-config.at
index 19cf85c..a4301e1 100644
--- a/test/nbb-config.at
+++ b/test/nbb-config.at
@@ -5,7 +5,7 @@ AT_TESTED([nbb])
 
 dnl ===================================================================
 
-AT_SETUP([nbb: git config defaults])
+AT_SETUP([nbb config: git defaults])
 AT_KEYWORDS([nbb git config])
 AT_CHECK([mkdir test.git && cd test.git])
 AT_CHECK([cd test.git && git init], [0],
@@ -26,7 +26,7 @@ AT_CLEANUP()
 
 dnl ===================================================================
 
-AT_SETUP([nbb: git config set/get])
+AT_SETUP([nbb config: git set/get])
 AT_KEYWORDS([nbb git config])
 AT_CHECK([mkdir test.git && cd test.git])
 AT_CHECK([cd test.git && git init], [0],
@@ -52,7 +52,7 @@ AT_CLEANUP()
 
 dnl ===================================================================
 
-AT_SETUP([nbb: bzr config defaults])
+AT_SETUP([nbb config: bzr defaults])
 AT_KEYWORDS([nbb bzr config])
 AT_CHECK([mkdir test.bzr && cd test.bzr])
 AT_CHECK([cd test.bzr && bzr init && bzr nick testnick])
@@ -71,8 +71,4 @@ AT_CLEANUP()
 
 dnl ===================================================================
 
-dnl ===================================================================
-
-dnl ===================================================================
-