From d3e386a632cd9a45c74cfcdeb44e1310616c52d5 Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Mon, 17 Feb 2014 15:49:48 +0000 Subject: cmdtests: Update to use new ordering --- tests.branching/edit-updates-stratum.stdout | 15 +++++----- tests.branching/petrify-no-double-petrify.stdout | 12 ++++---- tests.branching/petrify.stdout | 36 +++++++++++------------ tests.branching/setup | 20 ++++++------- tests.branching/setup-second-chunk | 16 +++++----- tests.branching/tag-creates-commit-and-tag.stdout | 23 +++++++-------- tests.branching/tag-tag-works-as-expected.stdout | 23 +++++++-------- 7 files changed, 71 insertions(+), 74 deletions(-) diff --git a/tests.branching/edit-updates-stratum.stdout b/tests.branching/edit-updates-stratum.stdout index ae1af132..a127f046 100644 --- a/tests.branching/edit-updates-stratum.stdout +++ b/tests.branching/edit-updates-stratum.stdout @@ -1,14 +1,13 @@ diff --git a/hello-stratum.morph b/hello-stratum.morph -index 73ed482..475fe0f 100644 +index e012b5f..cc0609a 100644 --- a/hello-stratum.morph +++ b/hello-stratum.morph -@@ -2,7 +2,8 @@ chunks: - - build-depends: [] - build-mode: test - name: hello +@@ -3,6 +3,7 @@ kind: stratum + chunks: + - name: hello + repo: test:hello - ref: master + ref: newbranch - repo: test:hello + unpetrify-ref: master - kind: stratum - name: hello-stratum + build-depends: [] + build-mode: test diff --git a/tests.branching/petrify-no-double-petrify.stdout b/tests.branching/petrify-no-double-petrify.stdout index 2218f632..50da61ba 100644 --- a/tests.branching/petrify-no-double-petrify.stdout +++ b/tests.branching/petrify-no-double-petrify.stdout @@ -1,9 +1,9 @@ +name: hello-stratum +kind: stratum chunks: -- build-depends: [] - build-mode: test - name: hello - ref: 6c7ddb7a9c0c5bf4ee02a8de030f0892a399c6bb +- name: hello repo: test:hello + ref: 293fa0b08f0382c63181c36b6efa602876aa8c87 unpetrify-ref: master -kind: stratum -name: hello-stratum + build-depends: [] + build-mode: test diff --git a/tests.branching/petrify.stdout b/tests.branching/petrify.stdout index 041b21d9..f9f35342 100644 --- a/tests.branching/petrify.stdout +++ b/tests.branching/petrify.stdout @@ -1,31 +1,31 @@ Petrified: +name: hello-stratum +kind: stratum chunks: -- build-depends: [] - build-mode: test - name: hello - ref: 6c7ddb7a9c0c5bf4ee02a8de030f0892a399c6bb +- name: hello repo: test:hello + ref: 293fa0b08f0382c63181c36b6efa602876aa8c87 unpetrify-ref: master -- build-depends: [] + build-depends: [] build-mode: test - name: goodbye - ref: 717c4a523fb5a94ca2f0a61e665fbc2da6a1f6ac +- name: goodbye repo: test:goodbye + ref: 717c4a523fb5a94ca2f0a61e665fbc2da6a1f6ac unpetrify-ref: test/petrify -kind: stratum -name: hello-stratum + build-depends: [] + build-mode: test Unpetrified: +name: hello-stratum +kind: stratum chunks: -- build-depends: [] - build-mode: test - name: hello - ref: master +- name: hello repo: test:hello -- build-depends: [] + ref: master + build-depends: [] build-mode: test - name: goodbye - ref: test/petrify +- name: goodbye repo: test:goodbye -kind: stratum -name: hello-stratum + ref: test/petrify + build-depends: [] + build-mode: test diff --git a/tests.branching/setup b/tests.branching/setup index 9dfe27df..06a05e90 100755 --- a/tests.branching/setup +++ b/tests.branching/setup @@ -48,22 +48,22 @@ mkdir "$DATADIR/morphs" ln -s "$DATADIR/morphs" "$DATADIR/morphs.git" cat < "$DATADIR/morphs/hello-system.morph" -arch: $(uname -m) -kind: system name: hello-system +kind: system +arch: $(uname -m) strata: - morph: hello-stratum EOF cat < "$DATADIR/morphs/hello-stratum.morph" +name: hello-stratum +kind: stratum chunks: -- build-depends: [] - build-mode: test - name: hello - ref: master +- name: hello repo: test:hello -kind: stratum -name: hello-stratum + ref: master + build-depends: [] + build-mode: test EOF scripts/run-git-in "$DATADIR/morphs" init @@ -83,9 +83,9 @@ scripts/run-git-in "$DATADIR/morphs" checkout master mkdir "$DATADIR/hello" cat < "$DATADIR/hello/hello.morph" -build-system: dummy -kind: chunk name: hello +kind: chunk +build-system: dummy EOF scripts/run-git-in "$DATADIR/hello" init diff --git a/tests.branching/setup-second-chunk b/tests.branching/setup-second-chunk index 32de7d55..058fb222 100755 --- a/tests.branching/setup-second-chunk +++ b/tests.branching/setup-second-chunk @@ -1,5 +1,5 @@ #!/bin/sh -# 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 @@ -45,16 +45,16 @@ cat < hello-stratum.morph name: hello-stratum kind: stratum chunks: -- build-depends: [] - build-mode: test - name: hello - ref: master +- name: hello repo: test:hello -- build-depends: [] - build-mode: test - name: goodbye ref: master + build-depends: [] + build-mode: test +- name: goodbye repo: test:goodbye + ref: master + build-depends: [] + build-mode: test EOF git commit -q --all -m "Add goodbye to hello-stratum" diff --git a/tests.branching/tag-creates-commit-and-tag.stdout b/tests.branching/tag-creates-commit-and-tag.stdout index e1e2126a..31a818de 100644 --- a/tests.branching/tag-creates-commit-and-tag.stdout +++ b/tests.branching/tag-creates-commit-and-tag.stdout @@ -5,29 +5,28 @@ Date: Tue Jul 31 16:51:54 2012 +0000 Message -commit 53a2d5f00aead3f01c001da4b2b5677e25970b06 +commit 790f78a3fc6626189418ab744e39062ed4f41896 Author: developer Date: Tue Jul 31 16:51:54 2012 +0000 Message diff --git a/hello-stratum.morph b/hello-stratum.morph -index 73ed482..2218f63 100644 +index e012b5f..1a6f974 100644 --- a/hello-stratum.morph +++ b/hello-stratum.morph -@@ -2,7 +2,8 @@ chunks: - - build-depends: [] - build-mode: test - name: hello -- ref: master -+ ref: 6c7ddb7a9c0c5bf4ee02a8de030f0892a399c6bb +@@ -3,6 +3,7 @@ kind: stratum + chunks: + - name: hello repo: test:hello +- ref: master ++ ref: 293fa0b08f0382c63181c36b6efa602876aa8c87 + build-depends: [] + build-mode: test + unpetrify-ref: master - kind: stratum - name: hello-stratum test:morphs -commit 53a2d5f00aead3f01c001da4b2b5677e25970b06 +commit 790f78a3fc6626189418ab744e39062ed4f41896 Author: developer AuthorDate: Tue Jul 31 16:51:54 2012 +0000 Commit: developer @@ -35,7 +34,7 @@ CommitDate: Tue Jul 31 16:51:54 2012 +0000 Message -commit acb64a107d0ebdbbf0b6850b8272301a66c0a4b7 +commit dc323150575be26e3df0d2dab678560c04281b9f Author: developer AuthorDate: Tue Jul 31 16:51:54 2012 +0000 Commit: developer diff --git a/tests.branching/tag-tag-works-as-expected.stdout b/tests.branching/tag-tag-works-as-expected.stdout index 9525db0b..f0f4692e 100644 --- a/tests.branching/tag-tag-works-as-expected.stdout +++ b/tests.branching/tag-tag-works-as-expected.stdout @@ -9,29 +9,28 @@ Date: Tue Jul 31 16:51:54 2012 +0000 Second -commit 332fc39a03b63a9586950e0826374dc6fa4ceaf8 +commit e3aabbc0026a7a542f8d6b450d154ffa374af5b9 Author: developer Date: Tue Jul 31 16:51:54 2012 +0000 Second diff --git a/hello-stratum.morph b/hello-stratum.morph -index 73ed482..2218f63 100644 +index e012b5f..1a6f974 100644 --- a/hello-stratum.morph +++ b/hello-stratum.morph -@@ -2,7 +2,8 @@ chunks: - - build-depends: [] - build-mode: test - name: hello -- ref: master -+ ref: 6c7ddb7a9c0c5bf4ee02a8de030f0892a399c6bb +@@ -3,6 +3,7 @@ kind: stratum + chunks: + - name: hello repo: test:hello +- ref: master ++ ref: 293fa0b08f0382c63181c36b6efa602876aa8c87 + build-depends: [] + build-mode: test + unpetrify-ref: master - kind: stratum - name: hello-stratum test:morphs -commit 332fc39a03b63a9586950e0826374dc6fa4ceaf8 +commit e3aabbc0026a7a542f8d6b450d154ffa374af5b9 Author: developer AuthorDate: Tue Jul 31 16:51:54 2012 +0000 Commit: developer @@ -39,7 +38,7 @@ CommitDate: Tue Jul 31 16:51:54 2012 +0000 Second -commit acb64a107d0ebdbbf0b6850b8272301a66c0a4b7 +commit dc323150575be26e3df0d2dab678560c04281b9f Author: developer AuthorDate: Tue Jul 31 16:51:54 2012 +0000 Commit: developer -- cgit v1.2.1