summaryrefslogtreecommitdiffstats
path: root/test/nbb-runsh.at
diff options
context:
space:
mode:
Diffstat (limited to 'test/nbb-runsh.at')
-rw-r--r--test/nbb-runsh.at30
1 files changed, 19 insertions, 11 deletions
diff --git a/test/nbb-runsh.at b/test/nbb-runsh.at
index 67a4493..1b89da3 100644
--- a/test/nbb-runsh.at
+++ b/test/nbb-runsh.at
@@ -7,69 +7,77 @@ dnl ===================================================================
dnl Stuff to test:
dnl - (srcdir|builddir|installdir) (do|do not) exist
-dnl - sh with simple shell script works
dnl - run with simple shell script works
+dnl - sh with simple shell script works
dnl ===================================================================
AT_SETUP([nbb run-src])
-AT_KEYWORDS([nbb runsh run-src])
+AT_KEYWORDS([nbb runsh run srcdir])
AT_WRAP_GIT_AM([dnl
AT_CHECK([dnl
echo "$PWD/test.dir
RUN: @<:@'pwd'@:>@
in $PWD/test.dir" > expout
-cd test.dir && AT_NBB run-src pwd], [0], [expout])
+cd test.dir && AT_NBB run --srcdir pwd], [0], [expout])
])
AT_CLEANUP()
dnl ===================================================================
AT_SETUP([nbb run-build: non-existing builddir])
-AT_KEYWORDS([nbb runsh run-build])
+AT_KEYWORDS([nbb runsh run builddir])
AT_WRAP_GIT_AM([dnl
AT_CHECK([dnl
echo "ERROR: The builddir directory '$PWD/test.dir/_build/master' does not exist" > experr
-cd test.dir && AT_NBB run-build pwd], [1], [], [experr])
+cd test.dir && AT_NBB run --builddir pwd], [1], [], [experr])
+AT_CHECK([dnl
+echo "ERROR: The builddir directory '$PWD/test.dir/_build/master' does not exist" > experr
+cd test.dir && AT_NBB run pwd], [1], [], [experr])
])
AT_CLEANUP()
dnl ===================================================================
AT_SETUP([nbb run-install: non-existing installdir])
-AT_KEYWORDS([nbb runsh run-install])
+AT_KEYWORDS([nbb runsh run installdir])
AT_WRAP_GIT_AM([dnl
AT_CHECK([dnl
echo "ERROR: The installdir directory '$PWD/test.dir/_install/master' does not exist" > experr
-cd test.dir && AT_NBB run-install pwd], [1], [], [experr])
+cd test.dir && AT_NBB run --installdir pwd], [1], [], [experr])
])
AT_CLEANUP()
dnl ===================================================================
AT_SETUP([nbb run-build: after build])
-AT_KEYWORDS([nbb runsh run-build])
+AT_KEYWORDS([nbb runsh run builddir])
AT_WRAP_GIT_AM([dnl
AT_CHECK([cd test.dir && AT_NBB build], [0], [ignore], [ignore])
AT_CHECK([dnl
echo "$PWD/test.dir/_build/master
RUN: @<:@'pwd'@:>@
in $PWD/test.dir/_build/master" > expout
-cd test.dir && AT_NBB run-build pwd], [0], [expout])
+cd test.dir && AT_NBB run --builddir pwd], [0], [expout])
+AT_CHECK([dnl
+echo "$PWD/test.dir/_build/master
+RUN: @<:@'pwd'@:>@
+ in $PWD/test.dir/_build/master" > expout
+cd test.dir && AT_NBB run pwd], [0], [expout])
])
AT_CLEANUP()
dnl ===================================================================
AT_SETUP([nbb run-install: after install])
-AT_KEYWORDS([nbb runsh run-install])
+AT_KEYWORDS([nbb runsh run installdir])
AT_WRAP_GIT_AM([dnl
AT_CHECK([cd test.dir && AT_NBB install], [0], [ignore], [ignore])
AT_CHECK([dnl
echo "$PWD/test.dir/_install/master
RUN: @<:@'pwd'@:>@
in $PWD/test.dir/_install/master" > expout
-cd test.dir && AT_NBB run-install pwd], [0], [expout])
+cd test.dir && AT_NBB run --installdir pwd], [0], [expout])
])
AT_CLEANUP()