diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2011-12-06 19:53:47 +0000 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2011-12-06 19:53:47 +0000 |
commit | e19f81e7ed3f4d3dea144a71af8832c46eb7017a (patch) | |
tree | 013f8c4874ffa01602beadff324a15d54d3b44b8 /tests | |
parent | b41f0d6542472f1a90f559e33728aef84f45630a (diff) | |
download | morph-e19f81e7ed3f4d3dea144a71af8832c46eb7017a.tar.gz |
disable distcc for checks
We can't assume the host has distcc installed while running the checks.
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/build-chunk.script | 2 | ||||
-rwxr-xr-x | tests/build-stratum.script | 2 | ||||
-rwxr-xr-x | tests/build-system.script | 2 | ||||
-rwxr-xr-x | tests/missing-ref.script | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tests/build-chunk.script b/tests/build-chunk.script index 732c54f5..475d8c2b 100755 --- a/tests/build-chunk.script +++ b/tests/build-chunk.script @@ -22,7 +22,7 @@ set -e cache="$DATADIR/build-chunk-cache" ./morph --no-default-configs build repo farrokh hello.morph \ --git-base-url="file://$DATADIR" \ - --cachedir="$cache" --keep-path + --cachedir="$cache" --keep-path --no-distcc for chunk in "$cache/"*.chunk.* do echo "$chunk:" | sed 's/[^.]*//' diff --git a/tests/build-stratum.script b/tests/build-stratum.script index ead14e5d..81315711 100755 --- a/tests/build-stratum.script +++ b/tests/build-stratum.script @@ -22,5 +22,5 @@ set -e cache="$DATADIR/build-stratum-cache" ./morph --no-default-configs build repo farrokh hello-stratum.morph \ --git-base-url="file://$DATADIR" \ - --cachedir="$cache" --keep-path + --cachedir="$cache" --keep-path --no-distcc tar -tf "$cache/"*.stratum.* | LC_ALL=C sort | sed '/^\.\/./s:^\./::' diff --git a/tests/build-system.script b/tests/build-system.script index f081d1e8..1f81feda 100755 --- a/tests/build-system.script +++ b/tests/build-system.script @@ -22,5 +22,5 @@ set -e cache="$DATADIR/build-system-cache" ./morph --no-default-configs build repo farrokh hello-system.morph \ --git-base-url="file://$DATADIR" \ - --cachedir="$cache" --keep-path + --cachedir="$cache" --keep-path --no-distcc find "$cache" -name '*.system.*' -type f | wc -l diff --git a/tests/missing-ref.script b/tests/missing-ref.script index 3d5ebc98..978f50fa 100755 --- a/tests/missing-ref.script +++ b/tests/missing-ref.script @@ -22,5 +22,5 @@ set -e cache="$DATADIR/build-chunk-cache" ./morph --no-default-configs build repo non-existent-branch hello.morph \ --git-base-url="file://$DATADIR" \ - --cachedir="$cache" --keep-path + --cachedir="$cache" --keep-path --no-distcc |