diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-03-10 10:25:03 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-03-14 10:54:55 +0000 |
| commit | f366960273b026322f7e7cc3c1eb0cd632ebc73e (patch) | |
| tree | 51449f8ad44217e8ad922158e47512bb4fb57ff0 /tests.merging | |
| parent | 8592fe5681fb131f05434d208133bbc82f8109e1 (diff) | |
| download | morph-f366960273b026322f7e7cc3c1eb0cd632ebc73e.tar.gz | |
tests: Allow running ./check on 32-bit x86
uname will return the same string morph expects as an architecture on
x86_64, but the canonical x86_32 architecture names match i?86 instead.
To make it work on 32-bit, we replace calls to uname with morph
print-architecture, which does the translation for us.
Diffstat (limited to 'tests.merging')
| -rwxr-xr-x | tests.merging/setup | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests.merging/setup b/tests.merging/setup index 2fdf9db0..77b8bebc 100755 --- a/tests.merging/setup +++ b/tests.merging/setup @@ -1,5 +1,5 @@ #!/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 @@ -51,7 +51,7 @@ cat <<EOF > "$DATADIR/morphs/hello-system.morph" { "name": "hello-system", "kind": "system", - "arch": "$(uname -m)", + "arch": "$("$SRCDIR/scripts/test-morph" print-architecture)", "strata": [ { "morph": "hello-stratum", |