diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-10 11:09:51 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-09-10 20:04:06 +0100 |
| commit | a12cbe6e106c9f62e08a89a3c012a3f3d4a48e9d (patch) | |
| tree | 0315b2f2b1835886030922671c5712f3c6ddd866 /tests.branching | |
| parent | 02f4c93a143b7121c5bd84ec2e20c665149db4c8 (diff) | |
| download | morph-a12cbe6e106c9f62e08a89a3c012a3f3d4a48e9d.tar.gz | |
Preserve sort order of morphologies, so they can be edited by Morph
Diffstat (limited to 'tests.branching')
| -rw-r--r-- | tests.branching/edit-updates-stratum.stdout | 55 | ||||
| -rw-r--r-- | tests.branching/petrify.stdout | 16 |
2 files changed, 20 insertions, 51 deletions
diff --git a/tests.branching/edit-updates-stratum.stdout b/tests.branching/edit-updates-stratum.stdout index a61be053..260ac9a6 100644 --- a/tests.branching/edit-updates-stratum.stdout +++ b/tests.branching/edit-updates-stratum.stdout @@ -1,55 +1,26 @@ diff --git a/hello-stratum.morph b/hello-stratum.morph -index 006a96c..ad8c08b 100644 +index 006a96c..68fcbff 100644 --- a/hello-stratum.morph +++ b/hello-stratum.morph -@@ -1,12 +1,14 @@ - { -- "name": "hello-stratum", -- "kind": "stratum", -+ "build-system": "manual", - "chunks": [ +@@ -5,7 +5,7 @@ { -- "name": "hello", -- "repo": "baserock:hello", + "name": "hello", + "repo": "baserock:hello", - "ref": "master", -- "build-depends": [] -+ "build-depends": [], -+ "morph": "hello", -+ "name": "hello", -+ "ref": "newbranch", -+ "repo": "baserock:hello" ++ "ref": "newbranch", + "build-depends": [] } -- ] -+ ], -+ "kind": "stratum", -+ "name": "hello-stratum" - } + ] diff --git a/hello-system.morph b/hello-system.morph -index 1a33ed6..d5aae46 100644 +index 1a33ed6..9cca1bf 100644 --- a/hello-system.morph +++ b/hello-system.morph -@@ -1,14 +1,15 @@ - { -- "name": "hello-system", -- "kind": "system", -- "system-kind": "syslinux-disk", -- "arch": "x86_64", -- "disk-size": "1G", -+ "arch": "x86_64", -+ "build-system": "manual", -+ "disk-size": 1073741824, -+ "kind": "system", -+ "name": "hello-system", - "strata": [ +@@ -8,7 +8,7 @@ { -- "morph": "hello-stratum", -- "repo": "baserock:morphs", + "morph": "hello-stratum", + "repo": "baserock:morphs", - "ref": "master" -+ "morph": "hello-stratum", -+ "ref": "newbranch", -+ "repo": "baserock:morphs" ++ "ref": "newbranch" } -- ] -+ ], -+ "system-kind": "syslinux-disk" + ] } diff --git a/tests.branching/petrify.stdout b/tests.branching/petrify.stdout index ea0fb795..eecd51ce 100644 --- a/tests.branching/petrify.stdout +++ b/tests.branching/petrify.stdout @@ -1,14 +1,12 @@ { - "build-system": "manual", + "name": "hello-stratum", + "kind": "stratum", "chunks": [ { - "build-depends": [], - "morph": "hello", - "name": "hello", - "ref": "f4d032b42c0134e67bdf19a43fa99072493667d7", - "repo": "baserock:hello" + "name": "hello", + "repo": "baserock:hello", + "ref": "f4d032b42c0134e67bdf19a43fa99072493667d7", + "build-depends": [] } - ], - "kind": "stratum", - "name": "hello-stratum" + ] } |