diff options
author | Richard Maw <richard.maw@gmail.com> | 2014-08-14 18:34:23 +0100 |
---|---|---|
committer | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2014-08-15 10:47:09 +0000 |
commit | c85c37fcb7e216278b7c672a97887833370bc1a9 (patch) | |
tree | 444ec1a604448c25bb631bbbcef5d31fc0ea9c16 | |
parent | 00837372abc82209e1e71693b2e1eefc54718bbc (diff) | |
download | morph-c85c37fcb7e216278b7c672a97887833370bc1a9.tar.gz |
Remove cmdtests deprecated by yarns
"morph makes temporary build branches for uncommitted changes when
necessary" makes these redundant.
-rwxr-xr-x | tests.as-root/building-creates-correct-temporary-refs.script | 55 | ||||
-rw-r--r-- | tests.as-root/building-creates-correct-temporary-refs.stdout | 27 |
2 files changed, 0 insertions, 82 deletions
diff --git a/tests.as-root/building-creates-correct-temporary-refs.script b/tests.as-root/building-creates-correct-temporary-refs.script deleted file mode 100755 index 6fb6c83a..00000000 --- a/tests.as-root/building-creates-correct-temporary-refs.script +++ /dev/null @@ -1,55 +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. - - -## Make sure "morph build" works anywhere in a workspace or system branch -## and produces the same results every time. - -# FIXME: This seems to break because the new "morph edit" makes correct -# changes to build-dependencies, which breaks the old "morph build". -# Disable test now, re-enable it after "morph build" is fixed. --liw -cat "$SRCDIR/tests.as-root/building-creates-correct-temporary-refs.stdout" -exit 0 - -set -eu - -source "$SRCDIR/tests.as-root/setup-build" - -# Build the linux system from the system branch. -cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" build linux-system - -# Verify that the right temporary refs were created. -echo "Refs of morphs repo after first build:" -"$SRCDIR/scripts/run-git-in" "$DATADIR/workspace/branch1/test/morphs" \ - show-ref | cut -d' ' -f2 -echo "Refs of kernel repo after first build:" -"$SRCDIR/scripts/run-git-in" "$DATADIR/workspace/branch1/test/kernel-repo" \ - show-ref | cut -d' ' -f2 -echo - -# Change the build ref prefix and build again. -cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" --build-ref-prefix=newprefix build linux-system - -# Verify that the right temporary refs were created. -echo "Refs of morphs repo after second build:" -"$SRCDIR/scripts/run-git-in" "$DATADIR/workspace/branch1/test/morphs" \ - show-ref | cut -d' ' -f2 -echo "Refs of kernel repo after second build:" -"$SRCDIR/scripts/run-git-in" "$DATADIR/workspace/branch1/test/kernel-repo" \ - show-ref | cut -d' ' -f2 diff --git a/tests.as-root/building-creates-correct-temporary-refs.stdout b/tests.as-root/building-creates-correct-temporary-refs.stdout deleted file mode 100644 index 3416028a..00000000 --- a/tests.as-root/building-creates-correct-temporary-refs.stdout +++ /dev/null @@ -1,27 +0,0 @@ -Refs of morphs repo after first build: -refs/heads/baserock/builds/123456789/987654321 -refs/heads/branch1 -refs/heads/master -refs/remotes/origin/HEAD -refs/remotes/origin/master -Refs of kernel repo after first build: -refs/heads/baserock/builds/123456789/AABBCCDDE -refs/heads/branch1 -refs/heads/master -refs/remotes/origin/HEAD -refs/remotes/origin/master - -Refs of morphs repo after second build: -refs/heads/baserock/builds/123456789/987654321 -refs/heads/branch1 -refs/heads/master -refs/heads/newprefix/123456789/987654321 -refs/remotes/origin/HEAD -refs/remotes/origin/master -Refs of kernel repo after second build: -refs/heads/baserock/builds/123456789/AABBCCDDE -refs/heads/branch1 -refs/heads/master -refs/heads/newprefix/123456789/AABBCCDDE -refs/remotes/origin/HEAD -refs/remotes/origin/master |