diff options
| author | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-05-02 10:57:55 +0000 |
|---|---|---|
| committer | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-05-03 12:51:24 +0000 |
| commit | 5b7f918f66df140ff38a9955f841c8aeeab6089d (patch) | |
| tree | 1deff981f67277913c7ecf440de931e908b5e12b /tests.as-root | |
| parent | dc7f4153ae6f74fe747117154e02a2198be6e8c2 (diff) | |
| download | morph-5b7f918f66df140ff38a9955f841c8aeeab6089d.tar.gz | |
Use dedicated <cachedir>/artficats directory for local artifact cache.
Make sure that this directory is actually created before trying
to save artifacts to it. Also adjust all tests to use this new
directory for looking up artifacts.
Diffstat (limited to 'tests.as-root')
| -rwxr-xr-x | tests.as-root/make-patch.script | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests.as-root/make-patch.script b/tests.as-root/make-patch.script index 5c7083ae..873aa049 100755 --- a/tests.as-root/make-patch.script +++ b/tests.as-root/make-patch.script @@ -62,8 +62,8 @@ EOF # Build first image. Remember the stratum. "$SRCDIR/scripts/test-morph" build morphs-repo master hello-system.morph -img1=$(find "$DATADIR/cache" -maxdepth 1 -name '*.system.*') -stratum1=$(find "$DATADIR/cache" -maxdepth 1 -name '*.stratum.*') +img1=$(find "$DATADIR/cache/artifacts" -maxdepth 1 -name '*.system.*') +stratum1=$(find "$DATADIR/cache/artifacts" -maxdepth 1 -name '*.stratum.*') # Modify the chunk, in a new branch. "$SRCDIR/scripts/run-git-in" "$DATADIR/chunk-repo" checkout --quiet farrokh @@ -81,7 +81,7 @@ sed -i 's/farrokh/alfred/' "$DATADIR/morphs-repo/hello-stratum.morph" # Build second image. "$SRCDIR/scripts/test-morph" build morphs-repo alfred hello-system.morph -img2=$(find "$DATADIR/cache" -maxdepth 1 -name '*.system.*' \ +img2=$(find "$DATADIR/cache/artifacts" -maxdepth 1 -name '*.system.*' \ ! -name $(basename "$img1")) # Make the patch. |