diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2014-03-10 11:31:45 +0000 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2014-03-10 11:31:45 +0000 |
commit | 444ba7c2f0f3d53753abeff6dfd33681279a3d84 (patch) | |
tree | afdd012aa6d6001731e91dd863c9dbc45919d767 /tests.as-root/building-a-system-branch-works-anywhere.script | |
parent | 356e5f60268b154a5aa09b4fbcd716d908262b56 (diff) | |
parent | 2c4752d71d35ec31221dcdab1289d2084936ccae (diff) | |
download | morph-444ba7c2f0f3d53753abeff6dfd33681279a3d84.tar.gz |
Merge branch 'liw/fix-check-2-rebase'
Reviewed-by: Daniel Silverstone
Reviewed-by: Richard Maw
Diffstat (limited to 'tests.as-root/building-a-system-branch-works-anywhere.script')
-rwxr-xr-x | tests.as-root/building-a-system-branch-works-anywhere.script | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests.as-root/building-a-system-branch-works-anywhere.script b/tests.as-root/building-a-system-branch-works-anywhere.script index d5d1e52d..cf946cd5 100755 --- a/tests.as-root/building-a-system-branch-works-anywhere.script +++ b/tests.as-root/building-a-system-branch-works-anywhere.script @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2012-2013 Codethink Limited +# Copyright (C) 2012-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 @@ -41,13 +41,13 @@ cd "$DATADIR/workspace/branch1" rm -rf "$DATADIR/cache/artifacts"/* # Build form the branch root repository. -cd "$DATADIR/workspace/branch1/test:morphs" +cd "$DATADIR/workspace/branch1/test/morphs" "$SRCDIR/scripts/test-morph" build linux-system "$SRCDIR/scripts/list-tree" "$DATADIR/cache/artifacts" > "$DATADIR/output3" rm -rf "$DATADIR/cache/artifacts"/* # Build from the linux directory. -cd "$DATADIR/workspace/branch1/test:kernel-repo" +cd "$DATADIR/workspace/branch1/test/kernel-repo" "$SRCDIR/scripts/test-morph" build linux-system "$SRCDIR/scripts/list-tree" "$DATADIR/cache/artifacts" > "$DATADIR/output4" rm -rf "$DATADIR/cache/artifacts"/* |