summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorHans Ulrich Niedermann <hun@n-dimensional.de>2008-07-26 11:26:15 +0200
committerHans Ulrich Niedermann <hun@n-dimensional.de>2008-07-26 11:26:15 +0200
commit7a90533a806fd76e89795fff427473e7264662f7 (patch)
tree7bcf5c2f4455887a9786bdb60708126ef936329b /test
parent37ee99e8e72e2b8c50bec80f9b2bacc8dde04df7 (diff)
downloadnbb-releases.tar.gz
nbb-releases.tar.xz
nbb-releases.zip
nbb 0.2releases
* Switch to release tags including the package name * Make automake's "nbb make" depend on configure etc. Squashed commit of the following: commit 9c4a035b71c7648b006b91a52e86edb2baea5138 Author: Hans Ulrich Niedermann <hun@n-dimensional.de> Date: Sat Jul 26 10:36:31 2008 +0200 New version tag syntax: "make tag VER=1.2" commit fefebc702664a683ceeafa800b0fe75178d63037 Author: Hans Ulrich Niedermann <hun@n-dimensional.de> Date: Sat Jul 26 10:30:02 2008 +0200 Switch to release tags including the package name This will reduce tag confusion when we fork into a different project. A tag like nbb-1.2 or foo-tools-1.2 is much more useful than v1.2. commit 330c382390ffbe3c361a763d5cee6febe1b30f5e Author: Hans Ulrich Niedermann <hun@n-dimensional.de> Date: Tue Jul 22 12:08:41 2008 +0200 Remove obsolete .htaccess file commit b1d5fc06e235a45561bf53b4bfd07856cec4ea81 Author: Hans Ulrich Niedermann <hun@n-dimensional.de> Date: Thu Jul 24 15:03:14 2008 +0200 Make automake's "make" command depend on configure commit 958e81655ad143dfd54b099637db60db42f77fb0 Author: Hans Ulrich Niedermann <hun@n-dimensional.de> Date: Thu Jul 24 15:00:33 2008 +0200 Adjust testcases for absolute builddirs When configure is called as /path/to/configure instead of ../path/to/configure, the ".git/" test directories are reported by "git init" using absolute pathnames, not must ".git/". commit 72dac191283299c66356dc895eb6ba19982b16ab Author: Hans Ulrich Niedermann <hun@n-dimensional.de> Date: Thu Jul 24 14:59:19 2008 +0200 Fix typo in automake/distcheck test case commit 7ca2e00188d8668b6b1f4116559ddae4e3cbb35c Author: Hans Ulrich Niedermann <hun@n-dimensional.de> Date: Thu Jul 24 13:32:49 2008 +0200 Open 0.1.x section in NEWS commit e05a138e9e3099455fa23799550949512188b3c9 Author: Hans Ulrich Niedermann <hun@n-dimensional.de> Date: Tue Jul 22 08:40:31 2008 +0200 Add license review to TODO commit e2fd1f2e101486859899049147df7993c8042df7 Author: Hans Ulrich Niedermann <hun@n-dimensional.de> Date: Sat Jul 19 00:25:12 2008 +0200 Ensure cmp/mv/rm rules are correct and silent Make sure the "if cmp ... mv .. rm" in make rules are correct and useful, and the cmp is silent. commit b6e7a354ed1ab53aebdb775a800156629744a065 Author: Hans Ulrich Niedermann <hun@n-dimensional.de> Date: Wed Jul 16 21:03:36 2008 +0200 Reflect code progress in TODO file, add plans commit 9559ceb5def8ec5d2e5674e7bf25b484877b3e60 Author: Hans Ulrich Niedermann <hun@n-dimensional.de> Date: Wed Jul 16 06:12:30 2008 +0200 Fix some issues found by pylint/pychecker Includes real issues like wrong argument numbers and missing ancestor __init__() calls, whitespace and comment cleanups. Cannot "fix" everything because of a good amount of the warnings raised by pylint/pychecker are false alarms. commit c73487455e8d9a283fcb328eab8573c4c5bc73c7 Author: Hans Ulrich Niedermann <hun@n-dimensional.de> Date: Wed Jul 16 06:11:57 2008 +0200 Add pylint and pychecker checks as "lint" target
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.am4
-rw-r--r--test/local.at8
-rw-r--r--test/nbb-automake.at2
-rw-r--r--test/nbb-config.at4
-rw-r--r--test/nbb-detect.at12
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