diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-15 10:51:25 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-15 10:51:25 +0000 |
| commit | 8046bf0aa9e3258be6ed79dc529ac6373c37c2d7 (patch) | |
| tree | 597d69de79831696f879c52fa580733ecd0175e6 /tests.as-root/setup | |
| parent | 1f06e41bfe51b8b9263135902ab5d990541b8cb0 (diff) | |
| parent | d2eb452ee48253d6e90f7aa4f6c41b6fd8cdf009 (diff) | |
| download | morph-8046bf0aa9e3258be6ed79dc529ac6373c37c2d7.tar.gz | |
Merge branch 'samthursfield/build-essential-2-rebase'
Conflicts:
morphlib/bins_tests.py
Reviewed-By: consensus
Diffstat (limited to 'tests.as-root/setup')
| -rwxr-xr-x | tests.as-root/setup | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests.as-root/setup b/tests.as-root/setup index 03a438e0..b9d5d477 100755 --- a/tests.as-root/setup +++ b/tests.as-root/setup @@ -110,6 +110,7 @@ chunks: - name: hello repo: test:chunk-repo ref: farrokh + build-mode: test build-depends: [] EOF git add hello-stratum.morph @@ -125,6 +126,7 @@ chunks: - name: tools repo: test:tools-repo ref: master + build-mode: test build-depends: [] EOF git add tools-stratum.morph @@ -153,6 +155,7 @@ chunks: - name: linux repo: test:kernel-repo ref: master + build-mode: test build-depends: [] EOF git add linux-stratum.morph @@ -200,7 +203,6 @@ cat <<EOF > "$DATADIR/morph.conf" repo-alias = test=file://$DATADIR/#file://$DATADIR/ cachedir = $DATADIR/cache log = $DATADIR/morph.log -keep-path = true no-distcc = true quiet = true log = /tmp/morph.log |