diff options
author | Richard Maw <richard.maw@gmail.com> | 2014-09-24 20:37:29 +0000 |
---|---|---|
committer | Richard Maw <richard.maw@gmail.com> | 2014-10-01 09:30:15 +0000 |
commit | 54c81674db48d5c9eb151199ef1bc434fd1bd4a6 (patch) | |
tree | e885fa0240b83ef70eafa1a49a99538e13abde14 /tests.as-root | |
parent | 6b28a2798c0ad938c4d365404ad2812b610b5b23 (diff) | |
download | morph-54c81674db48d5c9eb151199ef1bc434fd1bd4a6.tar.gz |
Move the branch-from-image test to a yarn
Diffstat (limited to 'tests.as-root')
-rwxr-xr-x | tests.as-root/branch-from-image-works.script | 57 | ||||
l--------- | tests.as-root/branch-from-image-works.setup | 1 | ||||
-rw-r--r-- | tests.as-root/branch-from-image-works.stdout | 1 |
3 files changed, 0 insertions, 59 deletions
diff --git a/tests.as-root/branch-from-image-works.script b/tests.as-root/branch-from-image-works.script deleted file mode 100755 index fb0b09c9..00000000 --- a/tests.as-root/branch-from-image-works.script +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2013-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. - - -# A branch created with branch-from-image has the right commits specified - -set -eu - -# Disable test on versions of Python before 2.7. -. "$SRCDIR/scripts/python-check" - -. "$SRCDIR/scripts/fix-committer-info" - -tar=$("$SRCDIR/scripts/test-morph" --find-system-artifact \ - build-morphology test:morphs tarball hello-tarball) - -extracted="$DATADIR/extracted" -mkdir -p "$extracted" -tar -xf "$tar" -C "$extracted" -get_sha1(){ - sed -nre '/sha1/s/^.*([0-9a-f]{40}).*$/\1/p' "$1" -} -hello_chunk_commit=$(get_sha1 "$extracted/baserock/hello-bins.meta") - -# Make a commit so that petrifying from HEAD is detectable -chunkrepo="$DATADIR/chunk-repo" -cd "$chunkrepo" -git checkout --quiet farrokh -sed -i -e 's/hello, world/goodbye, world/g' hello.c -git add hello.c -git commit --quiet -m 'Make hello say goodbye' - - -workspace="$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" init "$workspace" -cd "$workspace" -"$SRCDIR/scripts/test-morph" branch-from-image mybranch \ - --metadata-dir="$extracted/baserock" -cd mybranch/test/morphs -grep -qFe "$hello_chunk_commit" hello-stratum.morph -tar=$("$SRCDIR/scripts/test-morph" --find-system-artifact build hello-tarball) -tar -xf "$tar" bin/hello -bin/hello diff --git a/tests.as-root/branch-from-image-works.setup b/tests.as-root/branch-from-image-works.setup deleted file mode 120000 index aac6926a..00000000 --- a/tests.as-root/branch-from-image-works.setup +++ /dev/null @@ -1 +0,0 @@ -metadata-includes-morph-version.setup
\ No newline at end of file diff --git a/tests.as-root/branch-from-image-works.stdout b/tests.as-root/branch-from-image-works.stdout deleted file mode 100644 index 4b5fa637..00000000 --- a/tests.as-root/branch-from-image-works.stdout +++ /dev/null @@ -1 +0,0 @@ -hello, world |