From 6b4739d65b61e828767676ff3d680530fab18bf4 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Tue, 1 Jul 2008 19:07:24 +0200 Subject: Use PYTHON and NBB_SCRIPT vars in test suite --- test/Makefile.am | 5 +++++ test/local.at | 33 +++++++++++++++++++++++++++++++++ test/nbb-automake.at | 12 ++++++------ test/nbb-basic.at | 25 ++++++++++++------------- test/nbb-config.at | 20 ++++++++++---------- test/nbb-detect.at | 16 ++++++++-------- test/nbb-scons.at | 8 ++++---- 7 files changed, 78 insertions(+), 41 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index 3e30381..551c7bb 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -36,14 +36,19 @@ 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)"; \ + echo " " $(SHELL) "$(srcdir)/$(TESTSUITE)" AUTOTEST_PATH=`cd $(top_builddir)/src > /dev/null && pwd` PYTHONPATH="$${abs_top_builddir}/src" PYTHON="$(PYTHON)" NBB_SCRIPT="$${abs_top_builddir}/src/nbb" $(TESTSUITEFLAGS); \ $(SHELL) "$(srcdir)/$(TESTSUITE)" AUTOTEST_PATH=`cd $(top_builddir)/src > /dev/null && pwd` \ PYTHONPATH="$${abs_top_builddir}/src" \ + PYTHON="$(PYTHON)" \ + NBB_SCRIPT="$${abs_top_builddir}/src/nbb" \ $(TESTSUITEFLAGS) installcheck-local: atconfig atlocal $(srcdir)/$(TESTSUITE) @echo "INFO: Running installed test suite"; \ $(SHELL) "$(srcdir)/$(TESTSUITE)" AUTOTEST_PATH='$(DESTDIR)$(bindir)' \ PYTHONPATH="$(DESTDIR)$(pythondir)" \ + PYTHON="$(PYTHON)" \ + NBB_SCRIPT="$(DESTDIR)$(bindir)/nbb" \ $(TESTSUITEFLAGS) clean-local: diff --git a/test/local.at b/test/local.at index 42136f3..7bfb734 100644 --- a/test/local.at +++ b/test/local.at @@ -3,6 +3,39 @@ AT_TESTED([autom4te autoconf autoheader autoupdate autoreconf]) # Local initialization of the test environment would happen here +dnl Run proper python interpreter +dnl AT_PYTHON_TO_PATH()dnl +m4_define([AT_PYTHON_TO_PATH], [dnl +AS_IF([test -x "$PYTHON"], [pybindir=`dirname "$PYTHON"` +AS_IF([test -d "$pybindir"], [dnl +ifs=$IFS +found=false +IFS=: +for p in $PATH +do + IFS=$ifs + if test "x$pybindir" = "x$p" + then + found=: + break + fi +done +IFS=$ifs +if $found; then + PATH="$pybindir:$PATH" + export PATH +fi +])dnl +])dnl +])dnl + + +dnl AT_NBB +m4_define([AT_NBB], [dnl +$(if test "${NBB_SCRIPT-nbb}" = "nbb"; then echo "nbb"; else echo $PYTHON $NBB_SCRIPT; fi)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]) diff --git a/test/nbb-automake.at b/test/nbb-automake.at index 937f1b6..dff6dda 100644 --- a/test/nbb-automake.at +++ b/test/nbb-automake.at @@ -9,7 +9,7 @@ dnl =================================================================== AT_SETUP([nbb automake: init]) AT_KEYWORDS([nbb automake init]) AT_CREATE_GIT_AM() -AT_CHECK([cd test.git && nbb init], [0], [ignore], [ignore]) +AT_CHECK([cd test.git && AT_NBB init], [0], [ignore], [ignore]) AT_REMOVE_GIT_AM() AT_CLEANUP() @@ -18,7 +18,7 @@ dnl =================================================================== AT_SETUP([nbb automake: configure]) AT_KEYWORDS([nbb automake configure]) AT_CREATE_GIT_AM() -AT_CHECK([cd test.git && nbb configure], [0], [ignore], [ignore]) +AT_CHECK([cd test.git && AT_NBB configure], [0], [ignore], [ignore]) AT_REMOVE_GIT_AM() AT_CLEANUP() @@ -27,7 +27,7 @@ dnl =================================================================== AT_SETUP([nbb automake: build]) AT_KEYWORDS([nbb automake build]) AT_CREATE_GIT_AM() -AT_CHECK([cd test.git && nbb build], [0], [ignore], [ignore]) +AT_CHECK([cd test.git && AT_NBB build], [0], [ignore], [ignore]) AT_REMOVE_GIT_AM() AT_CLEANUP() @@ -36,7 +36,7 @@ dnl =================================================================== AT_SETUP([nbb automake: install]) AT_KEYWORDS([nbb automake install]) AT_CREATE_GIT_AM() -AT_CHECK([cd test.git && nbb install], [0], [ignore], [ignore]) +AT_CHECK([cd test.git && AT_NBB install], [0], [ignore], [ignore]) AT_REMOVE_GIT_AM() AT_CLEANUP() @@ -45,8 +45,8 @@ dnl =================================================================== AT_SETUP([nbb automake: make distcheck]) AT_KEYWORDS([nbb automake 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_CHECK([cd test.git && AT_NBB configure], [0], [ignore], [ignore]) +AT_CHECK([cd test.git && AT_NBB make distcheck], [0], [ignore], [ignore]) AT_REMOVE_GIT_AM() AT_CLEANUP() diff --git a/test/nbb-basic.at b/test/nbb-basic.at index da96a39..4da4795 100644 --- a/test/nbb-basic.at +++ b/test/nbb-basic.at @@ -2,14 +2,13 @@ dnl =================================================================== AT_COPYRIGHT([Copyright (C) 2008 Hans Ulrich Niedermann]) AT_TESTED([nbb]) - -dnl =================================================================== +AT_PYTHON_TO_PATH()dnl dnl =================================================================== AT_SETUP([nbb basic: --version option]) AT_KEYWORDS([nbb version]) -AT_CHECK([nbb --version], +AT_CHECK([AT_NBB --version], [0], [nbb (ndim's branch builder) AT_PACKAGE_VERSION ]) @@ -17,7 +16,7 @@ AT_CLEANUP() AT_SETUP([nbb basic: --version package name consistency]) AT_KEYWORDS([nbb version]) -AT_CHECK([nbb --version | sed 's/^@<:@^(@:>@*(//; s/)@<:@^)@:>@*$//' | sed "s/'//"], +AT_CHECK([AT_NBB --version | sed 's/^@<:@^(@:>@*(//; s/)@<:@^)@:>@*$//' | sed "s/'//"], [0], [AT_PACKAGE_NAME ]) @@ -27,14 +26,14 @@ dnl =================================================================== AT_SETUP([nbb basic: --help option]) AT_KEYWORDS([nbb help]) -AT_CHECK([nbb --help], [0], [ignore], [ignore]) +AT_CHECK([AT_NBB --help], [0], [ignore], [ignore]) AT_CLEANUP() dnl =================================================================== AT_SETUP([nbb basic: no parameters at all]) AT_KEYWORDS([nbb no parameters]) -AT_CHECK([nbb], [2], +AT_CHECK([AT_NBB], [2], [Command line error: nbb requires some arguments ], []) AT_CLEANUP() @@ -43,7 +42,7 @@ dnl =================================================================== AT_SETUP([nbb help: without params]) AT_KEYWORDS([nbb help]) -AT_CHECK([nbb help], [0], [ignore], []) +AT_CHECK([AT_NBB help], [0], [ignore], []) AT_CLEANUP() dnl =================================================================== @@ -55,7 +54,7 @@ sep='=======================================================================' echo "$sep" for cmd in $(nbb help | sed -n 's/^\t\(@<:@^ \t@:>@\{1,\}\).*/\1/p') do - nbb help "$cmd" || { s=$?; echo "Error running 'nbb help $cmd"; exit $s; } + AT_NBB help "$cmd" || { s=$?; echo "Error running 'nbb help $cmd"; exit $s; } echo "$sep" done], [0], [ignore], []) AT_CLEANUP() @@ -66,7 +65,7 @@ dnl =================================================================== AT_SETUP([nbb global option: --vcs=git]) AT_KEYWORDS([nbb vcs global]) -AT_CHECK([nbb --vcs=git --version], [0], [dnl +AT_CHECK([AT_NBB --vcs=git --version], [0], [dnl nbb (ndim's branch builder) AT_PACKAGE_VERSION ]) AT_CLEANUP() @@ -75,7 +74,7 @@ dnl =================================================================== AT_SETUP([nbb global option: --vcs git]) AT_KEYWORDS([nbb vcs global]) -AT_CHECK([nbb --vcs git --version], [0], [dnl +AT_CHECK([AT_NBB --vcs git --version], [0], [dnl nbb (ndim's branch builder) AT_PACKAGE_VERSION ]) AT_CLEANUP() @@ -84,7 +83,7 @@ dnl =================================================================== AT_SETUP([nbb global option: -v git]) AT_KEYWORDS([nbb vcs global]) -AT_CHECK([nbb -v git --version], [0], [dnl +AT_CHECK([AT_NBB -v git --version], [0], [dnl nbb (ndim's branch builder) AT_PACKAGE_VERSION ]) AT_CLEANUP() @@ -93,14 +92,14 @@ dnl =================================================================== 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_CHECK([AT_NBB -v git --vcs git --version], [1], [ignore], [ignore]) AT_CLEANUP() dnl =================================================================== AT_SETUP([nbb internal-config: show internal config]) AT_KEYWORDS([nbb internal-config]) -AT_CHECK([nbb internal-config], [0], [ignore], []) +AT_CHECK([AT_NBB internal-config], [0], [ignore], []) AT_CLEANUP() dnl =================================================================== diff --git a/test/nbb-config.at b/test/nbb-config.at index 3975f7c..34608c9 100644 --- a/test/nbb-config.at +++ b/test/nbb-config.at @@ -16,11 +16,11 @@ AC[_]INIT(nbb-test-git, 1.2.3, invalid@invalid.invalid) AC[_]OUTPUT ]) AT_CHECK([echo "$PWD/test.git" > expout -cd test.git && nbb config srcdir], [0], [expout]) +cd test.git && AT_NBB config srcdir], [0], [expout]) AT_CHECK([echo "$PWD/test.git/_build/master" > expout -cd test.git && nbb config builddir], [0], [expout]) +cd test.git && AT_NBB config builddir], [0], [expout]) AT_CHECK([echo "$PWD/test.git/_install/master" > expout -cd test.git && nbb config installdir], [0], [expout]) +cd test.git && AT_NBB config installdir], [0], [expout]) AT_CHECK([rm -rf test.git]) AT_CLEANUP() @@ -37,15 +37,15 @@ AC[_]INIT(nbb-test-git, 1.2.3, invalid@invalid.invalid) AC[_]OUTPUT ]) AT_CHECK([echo "$PWD/test.git" > expout -cd test.git && nbb config srcdir], [0], [expout]) +cd test.git && AT_NBB config srcdir], [0], [expout]) AT_CHECK([echo "$PWD/test.git/_build/master" > expout -cd test.git && nbb config builddir], [0], [expout]) +cd test.git && AT_NBB config builddir], [0], [expout]) AT_CHECK([cd test.git && nbb config builddir _foo]) AT_CHECK([echo "$PWD/test.git/_foo/master" > expout -cd test.git && nbb config builddir], [0], [expout]) +cd test.git && AT_NBB config builddir], [0], [expout]) AT_CHECK([cd test.git && nbb config builddir _bar]) AT_CHECK([echo "$PWD/test.git/_bar/master" > expout -cd test.git && nbb config builddir], [0], [expout]) +cd test.git && AT_NBB config builddir], [0], [expout]) dnl TBD: --unset or something similar to reset to defaults AT_CHECK([rm -rf test.git]) AT_CLEANUP() @@ -61,11 +61,11 @@ AT_DATA([test.bzr/configure.ac], [dnl AC[_]INIT(nbb-test-bzr, 1.2.3, invalid@invalid.invalid) AC[_]OUTPUT ]) -AT_CHECK([cd test.bzr && nbb config srcdir], [0], [expout]) +AT_CHECK([cd test.bzr && AT_NBB config srcdir], [0], [expout]) echo "$PWD/test.bzr/_build/testnick" > expout -AT_CHECK([cd test.bzr && nbb config builddir], [0], [expout]) +AT_CHECK([cd test.bzr && AT_NBB config builddir], [0], [expout]) echo "$PWD/test.bzr/_install/testnick" > expout -AT_CHECK([cd test.bzr && nbb config installdir], [0], [expout]) +AT_CHECK([cd test.bzr && AT_NBB config installdir], [0], [expout]) AT_CHECK([rm -rf test.bzr]) AT_CLEANUP() diff --git a/test/nbb-detect.at b/test/nbb-detect.at index 4b537ba..0ca3176 100644 --- a/test/nbb-detect.at +++ b/test/nbb-detect.at @@ -9,7 +9,7 @@ AT_SETUP([nbb detect-vcs: no VCS repository type]) AT_KEYWORDS([nbb detect vcs]) AT_CHECK([mkdir test.foo && cd test.foo]) AT_CHECK([echo "Unknown VCS source tree type: '$PWD/test.foo'" > expout -cd test.foo && nbb detect-vcs], [1], [expout]) +cd test.foo && AT_NBB detect-vcs], [1], [expout]) AT_CHECK([rm -rf test.foo]) AT_CLEANUP() @@ -22,7 +22,7 @@ AT_CHECK([cd test.git && git init], [0], [Initialized empty Git repository in .git/ ]) AT_CHECK([echo "VCS: git $PWD/test.git" > expout -cd test.git && nbb detect-vcs], [0], [expout]) +cd test.git && AT_NBB detect-vcs], [0], [expout]) AT_CHECK([rm -rf test.git]) AT_CLEANUP() @@ -33,7 +33,7 @@ AT_KEYWORDS([nbb detect vcs bzr]) AT_CHECK([mkdir test.bzr && cd test.bzr]) AT_CHECK([cd test.bzr && bzr init]) AT_CHECK([echo "VCS: bzr $PWD/test.bzr" > expout -cd test.bzr && nbb detect-vcs], [0], [expout]) +cd test.bzr && AT_NBB detect-vcs], [0], [expout]) AT_CHECK([rm -rf test.bzr]) AT_CLEANUP() @@ -50,7 +50,7 @@ AT_CHECK([echo "Ambigous VCS types detected for '$PWD/test.bzrgit': VCS type Branch name git master bzr testnick" > expout -cd test.bzrgit && nbb detect-vcs], [1], [expout]) +cd test.bzrgit && AT_NBB detect-vcs], [1], [expout]) AT_CHECK([rm -rf test.bzrgit]) AT_CLEANUP() @@ -67,7 +67,7 @@ AC[_]INIT(nbb-test-git, 1.2.3, invalid@invalid.invalid) AC[_]OUTPUT ]) AT_CHECK([echo "BS: automake $PWD/test.git" > expout -cd test.git && nbb detect-bs], [0], [expout]) +cd test.git && AT_NBB detect-bs], [0], [expout]) AT_CHECK([rm -rf test.git]) AT_CLEANUP() @@ -83,7 +83,7 @@ AT_DATA([test.git/SConstruct], [dnl # Test ]) AT_CHECK([echo "BS: scons $PWD/test.git" > expout -cd test.git && nbb detect-bs], [0], [expout]) +cd test.git && AT_NBB detect-bs], [0], [expout]) AT_CHECK([rm -rf test.git]) AT_CLEANUP() @@ -105,7 +105,7 @@ AT_DATA([test.git/SConstruct], [dnl AT_CHECK([echo "Ambigous BS types detected for '$PWD/test.git': automake scons" > expout -cd test.git && nbb detect-bs], [1], [expout]) +cd test.git && AT_NBB detect-bs], [1], [expout]) AT_CHECK([rm -rf test.git]) AT_CLEANUP() @@ -118,7 +118,7 @@ AT_CHECK([cd test.git && git init], [0], [Initialized empty Git repository in .git/ ]) AT_CHECK([echo "Unknown BS source tree type: '$PWD/test.git'" > expout -cd test.git && nbb detect-bs], [1], [expout]) +cd test.git && AT_NBB detect-bs], [1], [expout]) AT_CHECK([rm -rf test.git]) AT_CLEANUP() diff --git a/test/nbb-scons.at b/test/nbb-scons.at index 08e9a61..2998b3f 100644 --- a/test/nbb-scons.at +++ b/test/nbb-scons.at @@ -9,7 +9,7 @@ dnl =================================================================== AT_SETUP([nbb scons: init]) AT_KEYWORDS([nbb scons init]) AT_WRAP_GIT_SCONS([dnl -AT_CHECK([cd test.dir && nbb init])dnl +AT_CHECK([cd test.dir && AT_NBB init])dnl ])dnl AT_CLEANUP()dnl @@ -18,7 +18,7 @@ dnl =================================================================== AT_SETUP([nbb scons: configure]) AT_KEYWORDS([nbb scons configure]) AT_WRAP_GIT_SCONS([dnl -AT_CHECK([cd test.dir && nbb configure])dnl +AT_CHECK([cd test.dir && AT_NBB configure])dnl ])dnl AT_CLEANUP()dnl @@ -35,7 +35,7 @@ gcc -o foobar foobar.o scons: done building targets. RUN: @<:@'scons'@:>@ in $PWD/test.dir" > expout -cd test.dir && nbb build], [0], [expout])dnl +cd test.dir && AT_NBB build], [0], [expout])dnl ])dnl AT_CLEANUP()dnl @@ -45,7 +45,7 @@ dnl AT_SETUP([nbb scons: install]) dnl AT_KEYWORDS([nbb scons install]) dnl AT_WRAP_GIT_SCONS([dnl dnl AT_CHECK([echo "FIXME $PWD/test.dir" > expout -dnl cd test.dir && nbb install], [0], [expout]) +dnl cd test.dir && AT_NBB install], [0], [expout]) dnl ])dnl dnl AT_CLEANUP()dnl -- cgit