diff options
Diffstat (limited to 'tests.merging')
25 files changed, 0 insertions, 668 deletions
diff --git a/tests.merging/basic.script b/tests.merging/basic.script deleted file mode 100755 index 5a1c1842..00000000 --- a/tests.merging/basic.script +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/sh -# -# 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 -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -## Check that "morph merge" merges a system branch into a newly created -## system branch - -set -eu - -cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" init - -# Create stable branch to merge TO -"$SRCDIR/scripts/test-morph" branch test:morphs test/stable -cd test/stable/test:morphs -git push --quiet origin test/stable - -# Create feature branch to merge FROM -"$SRCDIR/scripts/test-morph" branch test:morphs test/feature test/stable -cd "$DATADIR/workspace/test/feature" - -# Edit hello in FROM -"$SRCDIR/scripts/test-morph" edit hello -cd test:hello -touch newfile.txt -git add newfile.txt -git commit -m foo --quiet - -# Commit in morphs repo -# FIXME: this should become unnecessary since only the refs have -# changed. -cd ../test:morphs -git commit --all --quiet -m "Update morph refs for test/feature" - -# Merge changes back to test/stable -cd "$DATADIR/workspace" -cd test/stable -"$SRCDIR/scripts/test-morph" merge test/feature - -# Check results: changes to 'hello' should have been merged back to -# test/stable. -cd test:hello -[ -e newfile.txt ] - -# Make sure all changes are committed and to the correct branch ('hello' -# was built from 'master' before branching, so the changes should be -# merged back to 'master'). -git status --short -[ $(git rev-parse master) = $(git rev-parse HEAD) ] - -# Changes here should be on test/stable. -cd ../test:morphs -git status --short -[ $(git rev-parse test/stable) = $(git rev-parse HEAD) ] - -# Make sure all refs to the merged branch have gone. -! grep "\"ref\": \"test/feature\"" *.morph - -# The only change here was the branch refs, which have now been -# changed back - so there should not be any new commits. -echo "Commit message for test:morphs" -git cat-file commit HEAD | tail -n 1 - -echo -echo "Commit message for test:hello" -cd ../test:hello -git cat-file commit HEAD | tail -n 1 - diff --git a/tests.merging/basic.stdout b/tests.merging/basic.stdout deleted file mode 100644 index 7acb135c..00000000 --- a/tests.merging/basic.stdout +++ /dev/null @@ -1,5 +0,0 @@ -Commit message for test:morphs -initial - -Commit message for test:hello -Merge system branch 'test/feature' diff --git a/tests.merging/conflict-chunks.script b/tests.merging/conflict-chunks.script deleted file mode 100755 index b0d118ee..00000000 --- a/tests.merging/conflict-chunks.script +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/sh -# -# 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 -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -## When conflicts occur outside the root morphs repository, 'morph merge' -## should keep going until the end and report the list of failed repos. - -set -eu - -. "$SRCDIR/scripts/setup-3rd-party-strata" - -# Create stable branch to merge TO -"$SRCDIR/scripts/test-morph" branch test:morphs test/stable -cd test/stable/test:morphs -git push --quiet origin test/stable - -# Create feature branch to merge FROM -"$SRCDIR/scripts/test-morph" branch test:morphs test/feature test/stable - -add_text_in_repo() { - REPO="$1" - TEXT="$2" - - cd "$1" - echo $TEXT > conflict.txt - git add conflict.txt - git commit --quiet --message "Add some text" - cd - > /dev/null -} - -# Sow the seeds of conflict -cd "$DATADIR/workspace/test/stable" -"$SRCDIR/scripts/test-morph" edit hello -add_text_in_repo "test:stratum2-hello" "xyzzy" -add_text_in_repo "test:stratum3-hello" "xyzzy" - -cd "$DATADIR/workspace/test/feature" -"$SRCDIR/scripts/test-morph" edit hello -add_text_in_repo "test:stratum2-hello" "plugh" -add_text_in_repo "test:stratum3-hello" "plover" - -# This should not be necessary, one day -cd "$DATADIR/workspace/test/stable/test:morphs" -git commit --quiet --all --message "Commit refs for branch" -cd "$DATADIR/workspace/test/stable/test:external-strata" -git commit --quiet --all --message "Commit refs for branch" - -cd "$DATADIR/workspace/test/feature/test:morphs" -git commit --quiet --all --message "Commit refs for branch" -cd "$DATADIR/workspace/test/feature/test:external-strata" -git commit --quiet --all --message "Commit refs for branch" - -# Merge changes from test/feature to test/stable -cd "$DATADIR/workspace/test/stable" -"$SRCDIR/scripts/test-morph" merge test/feature || true - -# Check that the repos are all clean -for repo in "test:morphs" "test:external-strata" \ - "test:stratum2-hello" "test:stratum3-hello"; do - cd "$DATADIR/workspace/test/stable/$repo" - git status --porcelain - [ $(git rev-parse HEAD) = $(git rev-parse test/stable) ] -done diff --git a/tests.merging/conflict-chunks.stderr b/tests.merging/conflict-chunks.stderr deleted file mode 100644 index 57aafa5a..00000000 --- a/tests.merging/conflict-chunks.stderr +++ /dev/null @@ -1 +0,0 @@ -ERROR: merge errors were encountered. Please manually merge the target ref into test/feature in the remote system branch in each case, and then repeat the 'morph merge' operation. diff --git a/tests.merging/conflict-chunks.stdout b/tests.merging/conflict-chunks.stdout deleted file mode 100644 index 01ae550f..00000000 --- a/tests.merging/conflict-chunks.stdout +++ /dev/null @@ -1,4 +0,0 @@ -Merge conflicts in test:stratum2-hello: - conflict.txt -Merge conflicts in test:stratum3-hello: - conflict.txt diff --git a/tests.merging/conflict-morphology-kind.exit b/tests.merging/conflict-morphology-kind.exit deleted file mode 100644 index d00491fd..00000000 --- a/tests.merging/conflict-morphology-kind.exit +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/tests.merging/conflict-morphology-kind.script b/tests.merging/conflict-morphology-kind.script deleted file mode 100755 index cd2a24f5..00000000 --- a/tests.merging/conflict-morphology-kind.script +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# 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 -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -## If morphology kind differs between branches, it's a merge conflict - -set -eu - -cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" checkout test:morphs master -"$SRCDIR/scripts/test-morph" branch test:morphs test/unmergable - -cd "$DATADIR/workspace/test/unmergable/test:morphs" -sed -ie 's/"kind": "stratum"/"kind": "chunk"/' hello-stratum.morph -git commit --quiet --all -m "Unmergeable because kind has changed" - -cd "$DATADIR/workspace/master/test:morphs" -"$SRCDIR/scripts/test-morph" merge test/unmergable diff --git a/tests.merging/conflict-morphology-kind.stderr b/tests.merging/conflict-morphology-kind.stderr deleted file mode 100644 index ff6539a7..00000000 --- a/tests.merging/conflict-morphology-kind.stderr +++ /dev/null @@ -1 +0,0 @@ -ERROR: merge conflict: "kind" of morphology hello-system.hello-stratum changed from stratum to chunk diff --git a/tests.merging/conflict-stratum-field-ordering.exit b/tests.merging/conflict-stratum-field-ordering.exit deleted file mode 100644 index d00491fd..00000000 --- a/tests.merging/conflict-stratum-field-ordering.exit +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/tests.merging/conflict-stratum-field-ordering.script b/tests.merging/conflict-stratum-field-ordering.script deleted file mode 100755 index b83358bf..00000000 --- a/tests.merging/conflict-stratum-field-ordering.script +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/sh -# -# 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 -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -## Conflict caused by two equivalent strata having different order in two -## different branches - -## Morph should possibly resolve this conflict automatically in the future, -## because the meaning of the morphologies is unambiguious if not the -## contents. It depends on how much weight we give to the sort order of -## the morphology from a developer's point of view. - -set -eu - -cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" init - -# Create stable branch to merge TO -"$SRCDIR/scripts/test-morph" branch test:morphs test/stable -cd test/stable/test:morphs -git push --quiet origin test/stable - -# Create feature branch to merge FROM -"$SRCDIR/scripts/test-morph" branch test:morphs test/feature test/stable - -# Need 2 chunks! - -# Make a change in TO -cd "$DATADIR/workspace/test/stable" -cd test:morphs -cat <<EOF > "hello-stratum.morph" -{ - "name": "hello-stratum", - "kind": "stratum", - "chunks": [ - { - "name": "hello-runtime", - "repo": "test:hello", - "ref": "master", - "morph": "hello", - "build-depends": [] - }, - { - "name": "hello-devel", - "repo": "test:hello", - "ref": "master", - "morph": "hello", - "build-depends": [] - } - ] -} -EOF -git commit --quiet --all -m "Split up 'hello' chunk into runtime and devel" - -# Make a change in FROM that isn't very mergable -cd "$DATADIR/workspace/test/feature" -cd test:morphs -cat <<EOF > "hello-stratum.morph" -{ - "name": "hello-stratum", - "kind": "stratum", - "chunks": [ - { - "name": "hello-devel", - "repo": "test:hello", - "ref": "master", - "morph": "hello", - "build-depends": [] - }, - { - "name": "hello-runtime", - "repo": "test:hello", - "ref": "master", - "morph": "hello", - "build-depends": [] - } - ] -} -EOF -git commit --quiet --all -m "Split up 'hello' chunk into devel and runtime" - -# Merge changes from test/feature to test/stable - we expect failure -cd "$DATADIR/workspace/test/stable" -"$SRCDIR/scripts/test-morph" merge test/feature diff --git a/tests.merging/conflict-stratum-field-ordering.stderr b/tests.merging/conflict-stratum-field-ordering.stderr deleted file mode 100644 index 57aafa5a..00000000 --- a/tests.merging/conflict-stratum-field-ordering.stderr +++ /dev/null @@ -1 +0,0 @@ -ERROR: merge errors were encountered. Please manually merge the target ref into test/feature in the remote system branch in each case, and then repeat the 'morph merge' operation. diff --git a/tests.merging/conflict-stratum-field-ordering.stdout b/tests.merging/conflict-stratum-field-ordering.stdout deleted file mode 100644 index f55822a9..00000000 --- a/tests.merging/conflict-stratum-field-ordering.stdout +++ /dev/null @@ -1,2 +0,0 @@ -Merge conflicts in test:morphs: - hello-stratum.morph diff --git a/tests.merging/from-branch-not-checked-out.script b/tests.merging/from-branch-not-checked-out.script deleted file mode 100755 index e51af791..00000000 --- a/tests.merging/from-branch-not-checked-out.script +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2012 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 -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -## Handle 'from' branch not being checked out - -set -eu - -# Create system branch. -cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" init - -"$SRCDIR/scripts/test-morph" checkout test:morphs master -cd master - -# 'From' branch is not checked out (and also doesn't exist, but that -# problem can only be detected when 'morph checkout' is run) -"$SRCDIR/scripts/test-morph" merge baserock/newbranch || true diff --git a/tests.merging/from-branch-not-checked-out.stderr b/tests.merging/from-branch-not-checked-out.stderr deleted file mode 100644 index 6a9cc8a9..00000000 --- a/tests.merging/from-branch-not-checked-out.stderr +++ /dev/null @@ -1 +0,0 @@ -ERROR: branch baserock/newbranch must be checked out before it can be merged diff --git a/tests.merging/move-chunk-repo.exit b/tests.merging/move-chunk-repo.exit deleted file mode 100644 index d00491fd..00000000 --- a/tests.merging/move-chunk-repo.exit +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/tests.merging/move-chunk-repo.script b/tests.merging/move-chunk-repo.script deleted file mode 100755 index 405e6c88..00000000 --- a/tests.merging/move-chunk-repo.script +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -# -# 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 -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -## "morph merge" should detect changes in a repo that was added as part of the -## branch and warn the user that the changes will not be merged automatically - -set -eu - -# Create system branch. -cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch test:morphs baserock/newbranch - -"$SRCDIR/scripts/test-morph" edit hello - -# Chunk moves to a new location (we manually update the ref back to master -# here, so 'morph edit' can create a system branch in the new repo from it). -git clone -q "$DATADIR/hello" "$DATADIR/hello-lorried" -cd "$DATADIR/workspace/baserock/newbranch/test:morphs" -sed -e 's/"repo": "test:hello"/"repo": "test:hello-lorried"/' \ - -e 's/"ref": "baserock\/newbranch"/"ref": "master"/' \ - -i hello-stratum.morph -git commit -q --all -m "'hello' repository has moved" - -# Now we further edit the chunk, just for fun. -"$SRCDIR/scripts/test-morph" edit hello -cd "$DATADIR/workspace/baserock/newbranch/test:hello-lorried" -touch newfile.txt -git add newfile.txt -git commit -m "Add new file" --quiet - -cd "$DATADIR/workspace/baserock/newbranch/test:morphs" -git commit -q --all -m "Update system branch refs" - -# Try to merge changes back to master (should fail, because we don't support -# adding chunks inside branches yet). -cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" checkout test:morphs master -cd master -"$SRCDIR/scripts/test-morph" merge baserock/newbranch diff --git a/tests.merging/move-chunk-repo.stderr b/tests.merging/move-chunk-repo.stderr deleted file mode 100644 index 95fe61e6..00000000 --- a/tests.merging/move-chunk-repo.stderr +++ /dev/null @@ -1 +0,0 @@ -ERROR: chunk hello was added within this branch and subsequently edited. This is not yet supported: refusing to merge. diff --git a/tests.merging/rename-chunk.script b/tests.merging/rename-chunk.script deleted file mode 100755 index ac63cdd7..00000000 --- a/tests.merging/rename-chunk.script +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh -# -# 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 -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -## "morph merge" should pull changes from a chunk even if its name was changed -## in the branch - -set -eu - -# Create system branch. -cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch test:morphs baserock/newbranch - -# Rename the chunk, and then commit a seperate change -"$SRCDIR/scripts/test-morph" edit hello -cd baserock/newbranch/test:hello - -cat hello.morph | sed -e 's/"name": "hello"/"name": "goodbye"/' > goodbye.morph -git rm -q hello.morph -git add goodbye.morph -git commit -m "Rename chunk" --quiet - -touch newfile.txt -git add newfile.txt -git commit -m "Add new file" --quiet - -# Update stratum to point at the renamed chunk -cd ../test:morphs -sed -ie 's/"name": "hello"/"name": "goodbye"/' hello-stratum.morph -git commit --all --quiet -m "Update morph refs for baserock/newbranch" - -# Merge changes back to master -cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" checkout test:morphs master -cd master -"$SRCDIR/scripts/test-morph" merge baserock/newbranch - -# Morph should have realised that 'goodbye' is not a new chunk, -# and pulled in the changes from 'hello' in the old branch -cd test:hello -[ ! -e hello.morph ] -[ -e goodbye.morph ] -[ -e newfile.txt ] diff --git a/tests.merging/rename-stratum.exit b/tests.merging/rename-stratum.exit deleted file mode 100644 index d00491fd..00000000 --- a/tests.merging/rename-stratum.exit +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/tests.merging/rename-stratum.script b/tests.merging/rename-stratum.script deleted file mode 100755 index 11c4cb50..00000000 --- a/tests.merging/rename-stratum.script +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# -# 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 -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -## "morph merge" should deal with stratum renames; currently it doesn't deal -## very well, but at least we don't crash. - -set -eu - -# Create system branch. -cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch test:morphs baserock/newbranch - -# Rename the stratum -cd baserock/newbranch/test:morphs -sed -e 's/"morph": "hello-stratum"/"morph": "goodbye-stratum"/'\ - -i hello-system.morph -sed -e 's/"name": "hello-stratum"/"name": "goodbye-stratum"/' \ - hello-stratum.morph > goodbye-stratum.morph -git rm -q hello-stratum.morph -git add goodbye-stratum.morph -git commit -q --all -m "Rename hello-stratum to goodbye-stratum" - -# Merge changes back to master (this should fail, because we don't support -# adding strata inside branches yet). -cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" checkout test:morphs master -cd master -"$SRCDIR/scripts/test-morph" merge baserock/newbranch diff --git a/tests.merging/rename-stratum.stderr b/tests.merging/rename-stratum.stderr deleted file mode 100644 index 8ffed439..00000000 --- a/tests.merging/rename-stratum.stderr +++ /dev/null @@ -1 +0,0 @@ -ERROR: goodbye-stratum.morph was not found in TMP/workspace/master/test:morphs at ref 9d4b0981d6a2118cbd3d045cc1704b224d38296f diff --git a/tests.merging/setup b/tests.merging/setup deleted file mode 100755 index 77b8bebc..00000000 --- a/tests.merging/setup +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/bash -# 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 -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -# Set up $DATADIR. -# -# - a morph.conf configuration file -# - an empty morph workspace directory -# - a git repository called "morphs" for fake system, stratum morphologies -# - a git repository calle "hello" for a dummy chunk - -set -eu - -source "$SRCDIR/scripts/fix-committer-info" - -# Create a morph configuration file -cat <<EOF > "$DATADIR/morph.conf" -[config] -repo-alias = test=file://$DATADIR/%s#file://$DATADIR/%s -cachedir = $DATADIR/cache -log = $DATADIR/morph.log -no-distcc = true -quiet = true -EOF - - -# Create an empty directory to be used as a morph workspace -mkdir "$DATADIR/workspace" - - -# Create a fake morphs repository -mkdir "$DATADIR/morphs" - -## Create a link to this repo that has a .git suffix -ln -s "$DATADIR/morphs" "$DATADIR/morphs.git" - -cat <<EOF > "$DATADIR/morphs/hello-system.morph" -{ - "name": "hello-system", - "kind": "system", - "arch": "$("$SRCDIR/scripts/test-morph" print-architecture)", - "strata": [ - { - "morph": "hello-stratum", - "repo": "test:morphs", - "ref": "master" - } - ] -} -EOF - -cat <<EOF > "$DATADIR/morphs/hello-stratum.morph" -{ - "name": "hello-stratum", - "kind": "stratum", - "chunks": [ - { - "name": "hello", - "repo": "test:hello", - "ref": "master", - "build-depends": [] - } - ] -} -EOF - -scripts/run-git-in "$DATADIR/morphs" init -scripts/run-git-in "$DATADIR/morphs" add . -scripts/run-git-in "$DATADIR/morphs" commit -m initial - - -# Add an extra branch to the morphs repo. -scripts/run-git-in "$DATADIR/morphs" checkout -b alfred -touch "$DATADIR/morphs/this.is.alfred" -scripts/run-git-in "$DATADIR/morphs" add this.is.alfred -scripts/run-git-in "$DATADIR/morphs" commit --quiet -m 'mark as alfred' -scripts/run-git-in "$DATADIR/morphs" checkout master - - -# Create a dummy chunk repository -mkdir "$DATADIR/hello" - -cat <<EOF > "$DATADIR/hello/hello.morph" -{ - "name": "hello", - "kind": "chunk", - "build-system": "dummy" -} -EOF - -scripts/run-git-in "$DATADIR/hello" init -scripts/run-git-in "$DATADIR/hello" add . -scripts/run-git-in "$DATADIR/hello" commit -m initial - - -# Add an extra branch to the hello repo. -scripts/run-git-in "$DATADIR/hello" checkout -b alfred -scripts/run-git-in "$DATADIR/hello" checkout master - diff --git a/tests.merging/teardown b/tests.merging/teardown deleted file mode 100755 index 94928416..00000000 --- a/tests.merging/teardown +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# Copyright (C) 2012 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 -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -# Clean up $DATADIR. - -set -eu - -find "$DATADIR" -mindepth 1 -delete diff --git a/tests.merging/warn-if-merging-petrified-morphologies.script b/tests.merging/warn-if-merging-petrified-morphologies.script deleted file mode 100755 index 5753786c..00000000 --- a/tests.merging/warn-if-merging-petrified-morphologies.script +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2012 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 -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -## If the user merges a petrified branch into an unpetrified branch, -## we should warn them. - -set -eu - -cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" checkout test:morphs master -"$SRCDIR/scripts/test-morph" branch test:morphs test/petrified - -cd "$DATADIR/workspace/test/petrified/test:morphs" -"$SRCDIR/scripts/test-morph" petrify -git commit --quiet --all -m "Petrify branch" - -cd "$DATADIR/workspace/master/test:morphs" -"$SRCDIR/scripts/test-morph" merge test/petrified diff --git a/tests.merging/warn-if-merging-petrified-morphologies.stdout b/tests.merging/warn-if-merging-petrified-morphologies.stdout deleted file mode 100644 index 65985486..00000000 --- a/tests.merging/warn-if-merging-petrified-morphologies.stdout +++ /dev/null @@ -1 +0,0 @@ -WARNING: chunk "hello-system.hello-stratum.hello" is now petrified |