5 files changed, 18 insertions, 12 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index acb26d8..3a87f6b 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -87,7 +87,7 @@ $(srcdir)/testsuite.at: $(TESTCASES) Makefile.in
 		done; \
 	} > testsuite.at.new
 	@if test -f $(srcdir)/testsuite.at \
-	 && cmp testsuite.at.new $(srcdir)/testsuite.at; \
+	 && cmp testsuite.at.new $(srcdir)/testsuite.at > /dev/null; \
 	then rm -f testsuite.at.new; \
 	else echo "INFO: Updating $(srcdir)/testsuite.at"; \
 	     mv -f testsuite.at.new $(srcdir)/testsuite.at; fi
@@ -99,7 +99,7 @@ $(srcdir)/$(TESTSUITE): testsuite.at local.at package.m4 $(TESTCASES)
 	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) > /dev/null; \
 	then rm -f $(TESTSUITE).tmp; \
 	else echo "INFO: Updating $(srcdir)/$(TESTSUITE)"; \
 	     mv -f $(TESTSUITE).tmp $(srcdir)/$(TESTSUITE); fi
diff --git a/test/local.at b/test/local.at
index 0226c15..27e14de 100644
--- a/test/local.at
+++ b/test/local.at
@@ -36,10 +36,16 @@ $(if test "${NBB_SCRIPT-nbb}" = "nbb"; then echo "nbb"; else echo $PYTHON $NBB_S
 ])dnl
 
 
+dnl AT_GIT_INIT_OUTPUT_CANONICAL
+m4_define([AT_GIT_INIT_OUTPUT_CANONICAL], [dnl
+sed 's|^Initialized empty Git repository in @<:@a-zA-Z0-9/\._-@:>@\{1,\}.git/$|Initialized empty Git repository in .git/|' dnl
+])dnl
+
+
 dnl AT_WRAP_GIT([stuff-to-do-with-git-repo])dnl
 m4_define([AT_WRAP_GIT], [dnl
 AT_CHECK([mkdir test.dir && cd test.dir])
-AT_CHECK([cd test.dir && git init], [0],
+AT_CHECK([cd test.dir && git init | AT_GIT_INIT_OUTPUT_CANONICAL], [0],
 [Initialized empty Git repository in .git/
 ])dnl
 $1
diff --git a/test/nbb-automake.at b/test/nbb-automake.at
index bf9218d..a6596ff 100644
--- a/test/nbb-automake.at
+++ b/test/nbb-automake.at
@@ -44,7 +44,7 @@ dnl ===================================================================
 
 AT_SETUP([nbb automake: make distcheck])
 AT_KEYWORDS([nbb automake make distcheck])
-AT_WRAP_GIT_AM([dl
+AT_WRAP_GIT_AM([dnl
 AT_CHECK([cd test.dir && AT_NBB configure], [0], [ignore], [ignore])
 AT_CHECK([cd test.dir && AT_NBB make distcheck], [0], [ignore], [ignore])
 ])
diff --git a/test/nbb-config.at b/test/nbb-config.at
index 34608c9..cc44e44 100644
--- a/test/nbb-config.at
+++ b/test/nbb-config.at
@@ -8,7 +8,7 @@ dnl ===================================================================
 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],
+AT_CHECK([cd test.git && git init | AT_GIT_INIT_OUTPUT_CANONICAL], [0],
 [Initialized empty Git repository in .git/
 ])
 AT_DATA([test.git/configure.ac], [dnl
@@ -29,7 +29,7 @@ dnl ===================================================================
 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],
+AT_CHECK([cd test.git && git init | AT_GIT_INIT_OUTPUT_CANONICAL], [0],
 [Initialized empty Git repository in .git/
 ])
 AT_DATA([test.git/configure.ac], [dnl
diff --git a/test/nbb-detect.at b/test/nbb-detect.at
index d5458f4..aa2bf59 100644
--- a/test/nbb-detect.at
+++ b/test/nbb-detect.at
@@ -18,7 +18,7 @@ dnl ===================================================================
 AT_SETUP([nbb detect-vcs: git detection ])
 AT_KEYWORDS([nbb detect vcs git])
 AT_CHECK([mkdir test.git && cd test.git])
-AT_CHECK([cd test.git && git init], [0],
+AT_CHECK([cd test.git && git init | AT_GIT_INIT_OUTPUT_CANONICAL], [0],
 [Initialized empty Git repository in .git/
 ])
 AT_CHECK([echo "VCS: git $PWD/test.git" > expout
@@ -43,7 +43,7 @@ AT_SETUP([nbb detect-vcs: bzr AND git ambigous repository])
 AT_KEYWORDS([nbb detect vcs bzr git])
 AT_CHECK([mkdir test.bzrgit && cd test.bzrgit])
 AT_CHECK([cd test.bzrgit && bzr init && bzr nick testnick])
-AT_CHECK([cd test.bzrgit && git init], [0],
+AT_CHECK([cd test.bzrgit && git init | AT_GIT_INIT_OUTPUT_CANONICAL], [0],
 [Initialized empty Git repository in .git/
 ])
 AT_CHECK([echo "ERROR: Ambigous VCS types detected for '$PWD/test.bzrgit':
@@ -59,7 +59,7 @@ dnl ===================================================================
 AT_SETUP([nbb detect-bs: automake detection ])
 AT_KEYWORDS([nbb detect bs automake])
 AT_CHECK([mkdir test.git && cd test.git])
-AT_CHECK([cd test.git && git init], [0],
+AT_CHECK([cd test.git && git init | AT_GIT_INIT_OUTPUT_CANONICAL], [0],
 [Initialized empty Git repository in .git/
 ])
 AT_DATA([test.git/configure.ac], [dnl
@@ -76,7 +76,7 @@ dnl ===================================================================
 AT_SETUP([nbb detect-bs: scons detection])
 AT_KEYWORDS([nbb detect bs scons])
 AT_CHECK([mkdir test.git && cd test.git])
-AT_CHECK([cd test.git && git init], [0],
+AT_CHECK([cd test.git && git init | AT_GIT_INIT_OUTPUT_CANONICAL], [0],
 [Initialized empty Git repository in .git/
 ])
 AT_DATA([test.git/SConstruct], [dnl
@@ -92,7 +92,7 @@ dnl ===================================================================
 AT_SETUP([nbb detect-bs: automake AND scons detection ])
 AT_KEYWORDS([nbb detect bs scons automake])
 AT_CHECK([mkdir test.git && cd test.git])
-AT_CHECK([cd test.git && git init], [0],
+AT_CHECK([cd test.git && git init | AT_GIT_INIT_OUTPUT_CANONICAL], [0],
 [Initialized empty Git repository in .git/
 ])
 AT_DATA([test.git/configure.ac], [dnl
@@ -114,7 +114,7 @@ dnl ===================================================================
 AT_SETUP([nbb detect-bs: no BS detection])
 AT_KEYWORDS([nbb detect bs])
 AT_CHECK([mkdir test.git && cd test.git])
-AT_CHECK([cd test.git && git init], [0],
+AT_CHECK([cd test.git && git init | AT_GIT_INIT_OUTPUT_CANONICAL], [0],
 [Initialized empty Git repository in .git/
 ])
 AT_CHECK([echo "ERROR: Unknown BS source tree type: '$PWD/test.git'" > experr