From f366960273b026322f7e7cc3c1eb0cd632ebc73e Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Mon, 10 Mar 2014 10:25:03 +0000 Subject: 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. --- yarns/deployment.yarn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'yarns') 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 -- cgit v1.2.1