summaryrefslogtreecommitdiff
path: root/tests.branching
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@gmail.com>2014-09-24 17:20:06 +0000
committerRichard Maw <richard.maw@gmail.com>2014-10-01 09:30:15 +0000
commit59859a4e6de1271dbb6cc3046df8be115e809489 (patch)
treef8d13dfc266b25d8d6fac68e6409dd98f8c50424 /tests.branching
parentfd6e7adca086e86657efdcd0a10cb1d2b3c8ad1e (diff)
downloadmorph-59859a4e6de1271dbb6cc3046df8be115e809489.tar.gz
Stop tests.branching needing build-mode: test
It doesn't do any actual building, so it doesn't matter that using build-mode: bootstrap everywhere means that it would end up with an empty system artifact.
Diffstat (limited to 'tests.branching')
-rw-r--r--tests.branching/edit-updates-stratum.stdout4
-rwxr-xr-xtests.branching/setup2
-rwxr-xr-xtests.branching/setup-second-chunk4
3 files changed, 5 insertions, 5 deletions
diff --git a/tests.branching/edit-updates-stratum.stdout b/tests.branching/edit-updates-stratum.stdout
index a127f046..ee9510b5 100644
--- a/tests.branching/edit-updates-stratum.stdout
+++ b/tests.branching/edit-updates-stratum.stdout
@@ -1,5 +1,5 @@
diff --git a/hello-stratum.morph b/hello-stratum.morph
-index e012b5f..cc0609a 100644
+index f335879..7bf9d37 100644
--- a/hello-stratum.morph
+++ b/hello-stratum.morph
@@ -3,6 +3,7 @@ kind: stratum
@@ -10,4 +10,4 @@ index e012b5f..cc0609a 100644
+ ref: newbranch
+ unpetrify-ref: master
build-depends: []
- build-mode: test
+ build-mode: bootstrap
diff --git a/tests.branching/setup b/tests.branching/setup
index 22c51c24..a2d23090 100755
--- a/tests.branching/setup
+++ b/tests.branching/setup
@@ -63,7 +63,7 @@ chunks:
repo: test:hello
ref: master
build-depends: []
- build-mode: test
+ build-mode: bootstrap
EOF
scripts/run-git-in "$DATADIR/morphs" init
diff --git a/tests.branching/setup-second-chunk b/tests.branching/setup-second-chunk
index 058fb222..24604ab8 100755
--- a/tests.branching/setup-second-chunk
+++ b/tests.branching/setup-second-chunk
@@ -49,12 +49,12 @@ chunks:
repo: test:hello
ref: master
build-depends: []
- build-mode: test
+ build-mode: bootstrap
- name: goodbye
repo: test:goodbye
ref: master
build-depends: []
- build-mode: test
+ build-mode: bootstrap
EOF
git commit -q --all -m "Add goodbye to hello-stratum"