diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2013-12-18 18:40:43 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-01-16 17:35:06 +0000 |
| commit | 188fafc42db06161a1e1a39591b0d20cc083c5dc (patch) | |
| tree | 0da5c634f39e57db4358d6f27ae0ad2c05c22043 /tests.build/rebuild-cached-stratum.script | |
| parent | 57692c25491c4da23dac2691e035dba8f10e14d0 (diff) | |
| download | morph-188fafc42db06161a1e1a39591b0d20cc083c5dc.tar.gz | |
cmdtests: Take into account new constructed artifacts
Diffstat (limited to 'tests.build/rebuild-cached-stratum.script')
| -rwxr-xr-x | tests.build/rebuild-cached-stratum.script | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests.build/rebuild-cached-stratum.script b/tests.build/rebuild-cached-stratum.script index 306c16f2..0014e545 100755 --- a/tests.build/rebuild-cached-stratum.script +++ b/tests.build/rebuild-cached-stratum.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2011-2013 Codethink Limited +# Copyright (C) 2011-2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -30,7 +30,7 @@ cache="$DATADIR/cache/artifacts" git checkout --quiet farrokh && git checkout --quiet -b rebuild-cached-stratum) -# Make a branch in the morphs repo and modify the stratum to refer to +# Make a branch in the morphs repo and modify the stratum to refer to # the new chunk branch. (cd "$DATADIR/morphs-repo" && git checkout --quiet -b rebuild-cached-stratum && @@ -42,18 +42,18 @@ cache="$DATADIR/cache/artifacts" "$SRCDIR/scripts/test-morph" build-morphology \ test:morphs-repo rebuild-cached-stratum hello-system echo "first build:" -(cd "$cache" && ls *.chunk.* *hello-stratum | sed 's/^[^.]*\./ /' | - LC_ALL=C sort) +(cd "$cache" && ls *.chunk.* *hello-stratum-* | sed 's/^[^.]*\./ /' | + LC_ALL=C sort -u) # Change the chunk. -(cd "$DATADIR/chunk-repo" && - echo >> hello.c && +(cd "$DATADIR/chunk-repo" && + echo >> hello.c && git commit --quiet -am change) # Rebuild. "$SRCDIR/scripts/test-morph" build-morphology \ test:morphs-repo rebuild-cached-stratum hello-system echo "second build:" -(cd "$cache" && ls *.chunk.* *hello-stratum | sed 's/^[^.]*\./ /' | - LC_ALL=C sort) +(cd "$cache" && ls *.chunk.* *hello-stratum-* | sed 's/^[^.]*\./ /' | + LC_ALL=C sort -u) |