diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2014-03-06 17:20:06 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2014-03-06 19:41:35 +0000 |
| commit | 2c4752d71d35ec31221dcdab1289d2084936ccae (patch) | |
| tree | afdd012aa6d6001731e91dd863c9dbc45919d767 /tests.deploy | |
| parent | f42549fdefb05243cb6e9a46e88aa6185291efde (diff) | |
| download | morph-2c4752d71d35ec31221dcdab1289d2084936ccae.tar.gz | |
Fix paths for chunk directories in cmdtests
Diffstat (limited to 'tests.deploy')
| -rwxr-xr-x | tests.deploy/deploy-rawdisk.script | 4 | ||||
| -rw-r--r-- | tests.deploy/setup-build | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests.deploy/deploy-rawdisk.script b/tests.deploy/deploy-rawdisk.script index 257ef0dd..3489a198 100755 --- a/tests.deploy/deploy-rawdisk.script +++ b/tests.deploy/deploy-rawdisk.script @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2013-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 @@ -28,6 +28,6 @@ cd "$DATADIR/workspace/branch1" "$SRCDIR/scripts/test-morph" --log "$DATADIR/deploy.log" \ deploy rawdisk_test_cluster > /dev/null -outputdir="test:morphs" +outputdir="test/morphs" test -e $outputdir/disk.img diff --git a/tests.deploy/setup-build b/tests.deploy/setup-build index 6c0a6252..0fc561f9 100644 --- a/tests.deploy/setup-build +++ b/tests.deploy/setup-build @@ -1,6 +1,6 @@ #!/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 @@ -28,8 +28,8 @@ cd "$DATADIR/workspace" # Fix UUID's in the checked out repos to make build branch names deterministic git config -f "$DATADIR/workspace/branch1/.morph-system-branch/config" \ branch.uuid 123456789 -git config -f "$DATADIR/workspace/branch1/test:morphs/.git/config" \ +git config -f "$DATADIR/workspace/branch1/test/morphs/.git/config" \ morph.uuid 987654321 -git config -f "$DATADIR/workspace/branch1/test:kernel-repo/.git/config" \ +git config -f "$DATADIR/workspace/branch1/test/kernel-repo/.git/config" \ morph.uuid AABBCCDDE |