From 63048d217f7fcd813bf1a2763dd4bc6eaf738505 Mon Sep 17 00:00:00 2001 From: Jannis Pohlmann Date: Thu, 6 Sep 2012 15:56:06 +0000 Subject: Rename 'morph build' command to 'morph build-morphology' This is needed because we are replacing the current build command by a new one that builds from a local system branch. Since that will be the more common scenario, we want the new implementaiton to go by the name 'morph build'. This commit therefore renames 'morph build' and updates all the tests to use 'morph build-morphology' instead. --- tests/build-chunk-failures-dump-log.script | 3 ++- tests/build-chunk-writes-log.script | 3 ++- tests/build-chunk.script | 3 ++- tests/build-stratum-with-submodules.script | 3 ++- tests/build-stratum.script | 3 ++- tests/build-system-autotools-fails-if-autogen-fails.script | 5 +++-- tests/build-system-autotools.script | 3 ++- tests/build-system-cpan.script | 2 +- tests/build-system-python-distutils.script | 2 +- tests/missing-ref.script | 2 +- tests/morphless-chunks.script | 3 ++- tests/name-clash.script | 6 ++++-- tests/rebuild-cached-stratum.script | 8 ++++---- tests/stratum-overlap-warns.script | 5 ++--- tests/stratum-overlap-writes-overlap.script | 4 ++-- tests/uses-tempdir.script | 2 +- 16 files changed, 33 insertions(+), 24 deletions(-) (limited to 'tests') diff --git a/tests/build-chunk-failures-dump-log.script b/tests/build-chunk-failures-dump-log.script index e1015744..6f15c640 100755 --- a/tests/build-chunk-failures-dump-log.script +++ b/tests/build-chunk-failures-dump-log.script @@ -36,5 +36,6 @@ EOF git add false.morph git commit --quiet -m "Make a morphology that fails." -"$SRCDIR/scripts/test-morph" build test:chunk-repo master false.morph \ +"$SRCDIR/scripts/test-morph" build-morphology \ + test:chunk-repo master false.morph \ 2>/dev/null diff --git a/tests/build-chunk-writes-log.script b/tests/build-chunk-writes-log.script index 6b44d3cd..48557703 100755 --- a/tests/build-chunk-writes-log.script +++ b/tests/build-chunk-writes-log.script @@ -19,7 +19,8 @@ set -eu -"$SRCDIR/scripts/test-morph" build test:chunk-repo farrokh hello.morph +"$SRCDIR/scripts/test-morph" build-morphology \ + test:chunk-repo farrokh hello.morph SOURCES="$DATADIR/cached-sources" find "$DATADIR/cache/artifacts" -name '*.chunk.*' | diff --git a/tests/build-chunk.script b/tests/build-chunk.script index 3219194d..c73502c2 100755 --- a/tests/build-chunk.script +++ b/tests/build-chunk.script @@ -19,7 +19,8 @@ set -eu -"$SRCDIR/scripts/test-morph" build test:chunk-repo farrokh hello.morph +"$SRCDIR/scripts/test-morph" build-morphology \ + test:chunk-repo farrokh hello.morph for chunk in "$DATADIR/cache/artifacts/"*.chunk.* do diff --git a/tests/build-stratum-with-submodules.script b/tests/build-stratum-with-submodules.script index fee57d7c..06afd9f3 100755 --- a/tests/build-stratum-with-submodules.script +++ b/tests/build-stratum-with-submodules.script @@ -65,7 +65,8 @@ EOF # No build and verify we got a stratum. -"$SRCDIR/scripts/test-morph" build test:morphs-repo master submod-stratum.morph +"$SRCDIR/scripts/test-morph" build-morphology \ + test:morphs-repo master submod-stratum.morph "$SRCDIR/scripts/assemble-stratum" --cachedir "$DATADIR/cache" \ "$DATADIR/cache/artifacts/"*submod-stratum \ "$DATADIR/stratum.tar" submod-stratum diff --git a/tests/build-stratum.script b/tests/build-stratum.script index f4fa15a1..046b66f0 100755 --- a/tests/build-stratum.script +++ b/tests/build-stratum.script @@ -19,7 +19,8 @@ set -eu -"$SRCDIR/scripts/test-morph" build test:morphs-repo master hello-stratum.morph +"$SRCDIR/scripts/test-morph" build-morphology \ + test:morphs-repo master hello-stratum.morph "$SRCDIR/scripts/assemble-stratum" --cachedir "$DATADIR/cache" \ "$DATADIR/cache/artifacts/"*.hello-stratum \ "$DATADIR/stratum.tar" hello-stratum diff --git a/tests/build-system-autotools-fails-if-autogen-fails.script b/tests/build-system-autotools-fails-if-autogen-fails.script index 2028e7ff..06edcd29 100755 --- a/tests/build-system-autotools-fails-if-autogen-fails.script +++ b/tests/build-system-autotools-fails-if-autogen-fails.script @@ -33,6 +33,7 @@ chmod a+x "$x/autogen.sh" "$SRCDIR/scripts/run-git-in" "$x" add . "$SRCDIR/scripts/run-git-in" "$x" commit --quiet -m initial -"$SRCDIR/scripts/test-morph" build test:autogen-chunk master detected.morph \ - >/dev/null 2> /dev/null +"$SRCDIR/scripts/test-morph" build-morphology \ + test:autogen-chunk master detected.morph \ + >/dev/null 2> /dev/null diff --git a/tests/build-system-autotools.script b/tests/build-system-autotools.script index 8c29b340..992f34e0 100755 --- a/tests/build-system-autotools.script +++ b/tests/build-system-autotools.script @@ -47,7 +47,8 @@ EOF git add hello.morph git commit --quiet -m "Convert hello to an autotools project" -"$SRCDIR/scripts/test-morph" build test:chunk-repo farrokh hello.morph +"$SRCDIR/scripts/test-morph" build-morphology \ + test:chunk-repo farrokh hello.morph for chunk in "$DATADIR/cache/artifacts/"*.chunk.* do diff --git a/tests/build-system-cpan.script b/tests/build-system-cpan.script index 7fbe6540..94191395 100755 --- a/tests/build-system-cpan.script +++ b/tests/build-system-cpan.script @@ -53,7 +53,7 @@ git add hello.morph git commit --quiet -m 'convert hello into a perl cpan project' -"$SRCDIR/scripts/test-morph" build --prefix=/ \ +"$SRCDIR/scripts/test-morph" build-morphology --prefix=/ \ test:chunk-repo farrokh hello.morph for chunk in "$DATADIR/cache/artifacts/"*.chunk.* diff --git a/tests/build-system-python-distutils.script b/tests/build-system-python-distutils.script index bdf99623..470b175f 100755 --- a/tests/build-system-python-distutils.script +++ b/tests/build-system-python-distutils.script @@ -51,7 +51,7 @@ git add hello.morph git commit --quiet -m 'convert hello into a python project' -"$SRCDIR/scripts/test-morph" build --prefix= \ +"$SRCDIR/scripts/test-morph" build-morphology --prefix= \ test:chunk-repo farrokh hello.morph for chunk in "$DATADIR/cache/artifacts/"*.chunk.* diff --git a/tests/missing-ref.script b/tests/missing-ref.script index 51ffd459..0ee075d7 100755 --- a/tests/missing-ref.script +++ b/tests/missing-ref.script @@ -17,6 +17,6 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -"$SRCDIR/scripts/test-morph" build \ +"$SRCDIR/scripts/test-morph" build-morphology\ test:chunk-repo non-existent-branch hello.morph diff --git a/tests/morphless-chunks.script b/tests/morphless-chunks.script index 8ef653f6..45f88cd8 100755 --- a/tests/morphless-chunks.script +++ b/tests/morphless-chunks.script @@ -60,7 +60,8 @@ git init --quiet git add alfred.morph git commit --quiet -m initial -"$SRCDIR/scripts/test-morph" build test:stratum master alfred.morph +"$SRCDIR/scripts/test-morph" build-morphology \ + test:stratum master alfred.morph for chunk in "$DATADIR/cache/artifacts/"*.chunk.* do diff --git a/tests/name-clash.script b/tests/name-clash.script index dcc04a8a..974d15b0 100755 --- a/tests/name-clash.script +++ b/tests/name-clash.script @@ -48,10 +48,12 @@ EOF ) # build the dodgy chunk -"$SRCDIR/scripts/test-morph" build test:chunk-repo farrokh goodbye.morph +"$SRCDIR/scripts/test-morph" build-morphology \ + test:chunk-repo farrokh goodbye.morph # build a stratum -"$SRCDIR/scripts/test-morph" build test:morphs-repo master hello-stratum.morph +"$SRCDIR/scripts/test-morph" build-morphology \ + test:morphs-repo master hello-stratum.morph # unpack it and check the contents INSTDIR="$DATADIR"/unpack diff --git a/tests/rebuild-cached-stratum.script b/tests/rebuild-cached-stratum.script index 1bea1ae6..dee08dfb 100755 --- a/tests/rebuild-cached-stratum.script +++ b/tests/rebuild-cached-stratum.script @@ -37,8 +37,8 @@ cache="$DATADIR/cache/artifacts" git commit --quiet -m "rebuild-cached-stratum" -a) # Build the first time. -"$SRCDIR/scripts/test-morph" \ - build test:morphs-repo rebuild-cached-stratum hello-stratum.morph +"$SRCDIR/scripts/test-morph" build-morphology \ + test:morphs-repo rebuild-cached-stratum hello-stratum.morph echo "first build:" (cd "$cache" && ls *.chunk.* *hello-stratum | sed 's/^[^.]*\./ /' | LC_ALL=C sort) @@ -49,8 +49,8 @@ echo "first build:" git commit --quiet -am change) # Rebuild. -"$SRCDIR/scripts/test-morph" \ - build test:morphs-repo rebuild-cached-stratum hello-stratum.morph +"$SRCDIR/scripts/test-morph" build-morphology \ + test:morphs-repo rebuild-cached-stratum hello-stratum.morph echo "second build:" (cd "$cache" && ls *.chunk.* *hello-stratum | sed 's/^[^.]*\./ /' | LC_ALL=C sort) diff --git a/tests/stratum-overlap-warns.script b/tests/stratum-overlap-warns.script index ab6c6de6..08551333 100755 --- a/tests/stratum-overlap-warns.script +++ b/tests/stratum-overlap-warns.script @@ -28,9 +28,8 @@ warning_mentions(){ grep -F "$1" <"$warnings" >/dev/null 2>/dev/null } -"$SRCDIR/scripts/test-morph" \ - build --log=$log test:morphs-repo overlap overlap-stratum.morph \ - > /dev/null +"$SRCDIR/scripts/test-morph" build-morphology --log=$log \ + test:morphs-repo overlap overlap-stratum.morph > /dev/null grep WARNING "$log" >"$warnings" for str in overlap-stratum \ overlap-foo-baz overlap-foobar bin/bar \ diff --git a/tests/stratum-overlap-writes-overlap.script b/tests/stratum-overlap-writes-overlap.script index d40d3ba5..6ea0ceac 100755 --- a/tests/stratum-overlap-writes-overlap.script +++ b/tests/stratum-overlap-writes-overlap.script @@ -23,8 +23,8 @@ set -eu cache="$DATADIR/cache/artifacts" -"$SRCDIR/scripts/test-morph" \ - build test:morphs-repo overlap overlap-stratum.morph > /dev/null +"$SRCDIR/scripts/test-morph" build-morphology \ + test:morphs-repo overlap overlap-stratum.morph > /dev/null "$SRCDIR/scripts/list-overlaps" groups \ "$cache"/*.stratum.overlap-stratum.overlaps | while IFS='\n' read overlaps; do diff --git a/tests/uses-tempdir.script b/tests/uses-tempdir.script index 4143926f..b4cc2688 100755 --- a/tests/uses-tempdir.script +++ b/tests/uses-tempdir.script @@ -23,5 +23,5 @@ export TMPDIR TMPDIR="$DATADIR"/unwritable-tmp install -m 000 -d "$TMPDIR" mkdir "$DATADIR"/tmp -"$SRCDIR/scripts/test-morph" build --tempdir "$DATADIR"/tmp \ +"$SRCDIR/scripts/test-morph" build-morphology --tempdir "$DATADIR"/tmp \ test:morphs-repo master hello-stratum.morph -- cgit v1.2.1