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 /yarns | |
| 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 'yarns')
| -rw-r--r-- | yarns/deployment.yarn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/yarns/deployment.yarn b/yarns/deployment.yarn index a5da8ee5..88fd47a9 100644 --- a/yarns/deployment.yarn +++ b/yarns/deployment.yarn @@ -54,7 +54,7 @@ the same code paths as a real upgrade. AND system test-system in cluster test-cluster in branch master has deployment type: rawdisk AND system test-system in cluster test-cluster in branch master has deployment location: test.tar WHEN the user builds the system test-system in branch master - AND the user attempts to deploy the cluster test-cluster in branch master with options test-system.DISK_SIZE=10M test-system.VERSION_LABEL=test1 + AND the user attempts to deploy the cluster test-cluster in branch master with options test-system.DISK_SIZE=100M test-system.VERSION_LABEL=test1 THEN morph succeeded WHEN the user attempts to upgrade the cluster test-cluster in branch master with options test-system.VERSION_LABEL=test2 THEN morph succeeded |