diff options
author | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-11-23 14:18:40 +0000 |
---|---|---|
committer | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-11-24 09:56:17 +0000 |
commit | cbc3d789a4573704863de3a0247f55eda8b28638 (patch) | |
tree | d2ed4d405d2ca790826c4190b40c1699fbf4d46d /tests.branching/status-in-dirty-branch.script | |
parent | 822d5415edc61fafeb8709e27b6fb1a2ddd3b288 (diff) | |
download | morph-cbc3d789a4573704863de3a0247f55eda8b28638.tar.gz |
Remove tests for branch-and-merge plugin
Change-Id: Ie66b543eb67282c08a2651062727a4583057ee2d
Diffstat (limited to 'tests.branching/status-in-dirty-branch.script')
-rwxr-xr-x | tests.branching/status-in-dirty-branch.script | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/tests.branching/status-in-dirty-branch.script b/tests.branching/status-in-dirty-branch.script deleted file mode 100755 index 5cc8b3a4..00000000 --- a/tests.branching/status-in-dirty-branch.script +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2011-2015 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, see <http://www.gnu.org/licenses/>. - - -## 'morph status' within a branch - -set -eu - -# FIXME: This is disabled, since a) we haven't decided if we really -# want to support system and stratum morphologies in different git -# repos, and b) the rewritten "morph edit" thus doesn't support it, -# since writing the code is not necessarily simple if one wants to -# cover all corner cases. -cat "$SRCDIR/tests.branching/status-in-dirty-branch.stdout" -exit 0 - -. "$SRCDIR/scripts/setup-3rd-party-strata" - -cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" branch test:morphs branch1 - -# Make the branch have some interesting changes and pitfalls -cd branch1 -"$SRCDIR/scripts/test-morph" edit hello - -cd test/stratum2-hello -git checkout -q master - -cd .. -mkdir red-herring -cd red-herring -git init -q . - -"$SRCDIR/scripts/test-morph" status |