summaryrefslogtreecommitdiff
path: root/tests.merging
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-03-14 11:05:17 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2014-03-14 11:14:21 +0000
commit95df3b251b455843683b6e24aa4c76ed80beb724 (patch)
tree592626681db8abd3f22942b78c8cc515809bf070 /tests.merging
parentf366960273b026322f7e7cc3c1eb0cd632ebc73e (diff)
downloadmorph-95df3b251b455843683b6e24aa4c76ed80beb724.tar.gz
Revert "tests: Allow running ./check on 32-bit x86"
This reverts commit f366960273b026322f7e7cc3c1eb0cd632ebc73e. These changes break building on x86_64, which is our main development platform. Better patches will be forthcoming later.
Diffstat (limited to 'tests.merging')
-rwxr-xr-xtests.merging/setup2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests.merging/setup b/tests.merging/setup
index 77b8bebc..411fc45d 100755
--- a/tests.merging/setup
+++ b/tests.merging/setup
@@ -51,7 +51,7 @@ cat <<EOF > "$DATADIR/morphs/hello-system.morph"
{
"name": "hello-system",
"kind": "system",
- "arch": "$("$SRCDIR/scripts/test-morph" print-architecture)",
+ "arch": "$(uname -m)",
"strata": [
{
"morph": "hello-stratum",