From 25067e0ff261577da0ace26126c01e2829d7e5b7 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 7 Nov 2012 13:35:24 +0000 Subject: Factor out setup code from 'morph build' tests into separate file --- ...iple-times-doesnt-generate-new-artifacts.script | 21 +------------- .../building-a-system-branch-works-anywhere.script | 24 +--------------- .../building-creates-correct-temporary-refs.script | 20 +------------ tests.as-root/setup-build | 33 ++++++++++++++++++++++ 4 files changed, 36 insertions(+), 62 deletions(-) create mode 100644 tests.as-root/setup-build (limited to 'tests.as-root') diff --git a/tests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.script b/tests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.script index 56fd08cf..60093f97 100755 --- a/tests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.script +++ b/tests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.script @@ -27,26 +27,7 @@ then exit 0 fi -source "$SRCDIR/scripts/fix-committer-info" - -# Initialise the workspace. -cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" init - -# Create a new local system branch. -"$SRCDIR/scripts/test-morph" branch test:morphs-repo branch1 - -# Edit linux. -"$SRCDIR/scripts/test-morph" edit linux-system linux-stratum linux - -# Fix the UUIDs being used for the temporary refs. -git config -f "$DATADIR/workspace/branch1/.morph-system-branch/config" \ - branch.uuid 123456789 -git config -f "$DATADIR/workspace/branch1/test:morphs-repo/.git/config" \ - morph.uuid 987654321 -git config -f "$DATADIR/workspace/branch1/test:kernel-repo/.git/config" \ - morph.uuid AABBCCDDE - +source "$SRCDIR/tests.as-root/setup-build" # Build once. cd "$DATADIR/workspace" diff --git a/tests.as-root/building-a-system-branch-works-anywhere.script b/tests.as-root/building-a-system-branch-works-anywhere.script index 462963e0..b402355e 100755 --- a/tests.as-root/building-a-system-branch-works-anywhere.script +++ b/tests.as-root/building-a-system-branch-works-anywhere.script @@ -26,29 +26,7 @@ then exit 0 fi -source "$SRCDIR/scripts/fix-committer-info" - -# Initialise the workspace. -cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" init - -# Create a new local system branch. -"$SRCDIR/scripts/test-morph" branch test:morphs-repo branch1 - -# Edit linux. -"$SRCDIR/scripts/test-morph" edit linux-system linux-stratum linux - -# Fix the UUIDs being used for the temporary refs. This is needed -# because the system and stratum morphologies will have references -# to the temporary build refs and that will affect the artifact -# cache keys. If we fix the UUIDs, the artifact cache keys will -# always be the same. -git config -f "$DATADIR/workspace/branch1/.morph-system-branch/config" \ - branch.uuid 123456789 -git config -f "$DATADIR/workspace/branch1/test:morphs-repo/.git/config" \ - morph.uuid 987654321 -git config -f "$DATADIR/workspace/branch1/test:kernel-repo/.git/config" \ - morph.uuid AABBCCDDE +source "$SRCDIR/tests.as-root/setup-build" # Build from the workspace root. cd "$DATADIR/workspace" diff --git a/tests.as-root/building-creates-correct-temporary-refs.script b/tests.as-root/building-creates-correct-temporary-refs.script index c3ee7019..c69eb6a8 100755 --- a/tests.as-root/building-creates-correct-temporary-refs.script +++ b/tests.as-root/building-creates-correct-temporary-refs.script @@ -19,25 +19,7 @@ set -eu -source "$SRCDIR/scripts/fix-committer-info" - -# Initialise the workspace. -cd "$DATADIR/workspace" -"$SRCDIR/scripts/test-morph" init - -# Create a new local system branch. -"$SRCDIR/scripts/test-morph" branch test:morphs-repo branch1 - -# Edit linux. -"$SRCDIR/scripts/test-morph" edit linux-system linux-stratum linux - -# Fix the UUIDs being used for the temporary refs. -git config -f "$DATADIR/workspace/branch1/.morph-system-branch/config" \ - branch.uuid 123456789 -git config -f "$DATADIR/workspace/branch1/test:morphs-repo/.git/config" \ - morph.uuid 987654321 -git config -f "$DATADIR/workspace/branch1/test:kernel-repo/.git/config" \ - morph.uuid AABBCCDDE +source "$SRCDIR/tests.as-root/setup-build" # Build the linux system from the system branch. cd "$DATADIR/workspace" diff --git a/tests.as-root/setup-build b/tests.as-root/setup-build new file mode 100644 index 00000000..8d6e6612 --- /dev/null +++ b/tests.as-root/setup-build @@ -0,0 +1,33 @@ +#!/bin/bash +# 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. + +# Fixture for tests involving 'morph build' + +source "$SRCDIR/scripts/fix-committer-info" + +cd "$DATADIR/workspace" +"$SRCDIR/scripts/test-morph" init +"$SRCDIR/scripts/test-morph" branch test:morphs branch1 +"$SRCDIR/scripts/test-morph" edit linux-system linux-stratum linux + +# Fix UUID's in the checked out repos to make build branch names deterministic +git config -f "$DATADIR/workspace/branch1/.morph-system-branch/config" \ + branch.uuid 123456789 +git config -f "$DATADIR/workspace/branch1/test:morphs/.git/config" \ + morph.uuid 987654321 +git config -f "$DATADIR/workspace/branch1/test:kernel-repo/.git/config" \ + morph.uuid AABBCCDDE + -- cgit v1.2.1