From 767bf61ed6b40cd705b5e156fc79bd2130ec5d86 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Tue, 22 Jan 2013 11:57:44 +0000 Subject: Remove superfluous test tests.branching/edit-uses-ref-from-stratum tests behaviour that is already verified by tests.branching/edit-clones-chunk --- tests.branching/edit-uses-ref-from-stratum.script | 31 ----------------------- tests.branching/edit-uses-ref-from-stratum.stdout | 2 -- 2 files changed, 33 deletions(-) delete mode 100755 tests.branching/edit-uses-ref-from-stratum.script delete mode 100644 tests.branching/edit-uses-ref-from-stratum.stdout (limited to 'tests.branching') diff --git a/tests.branching/edit-uses-ref-from-stratum.script b/tests.branching/edit-uses-ref-from-stratum.script deleted file mode 100755 index b933996b..00000000 --- a/tests.branching/edit-uses-ref-from-stratum.script +++ /dev/null @@ -1,31 +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. - - -## Verify that "morph edit" clones a chunk repository into a system branch. - -set -eu - -# Create system branch. -cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" init -"$SRCDIR/scripts/test-morph" branch test:morphs newbranch - -# Edit chunk. -"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello - -"$SRCDIR/scripts/run-git-in" "newbranch/test:hello" branch diff --git a/tests.branching/edit-uses-ref-from-stratum.stdout b/tests.branching/edit-uses-ref-from-stratum.stdout deleted file mode 100644 index d14c4c96..00000000 --- a/tests.branching/edit-uses-ref-from-stratum.stdout +++ /dev/null @@ -1,2 +0,0 @@ - master -* newbranch -- cgit v1.2.1