From 55f2b612afa9433bbaa5b4d6043dfed79a13ba6a Mon Sep 17 00:00:00 2001 From: Tiago Gomes Date: Mon, 23 Nov 2015 11:10:42 +0000 Subject: Remove unnecessary scenario This is more suitable for being defined as an unit test rather than an integration test. Change-Id: I26564ec79d15d9e64c88024f4899108b8dfe71e5 --- yarns/architecture.yarn | 11 ----------- yarns/implementations.yarn | 32 -------------------------------- 2 files changed, 43 deletions(-) diff --git a/yarns/architecture.yarn b/yarns/architecture.yarn index ec5207c2..70349a8c 100644 --- a/yarns/architecture.yarn +++ b/yarns/architecture.yarn @@ -20,14 +20,3 @@ Morph Cross-Bootstrap Tests WHEN the user clones definitions THEN the user cross-bootstraps the system base-system-testarch.morph in branch master of repo test:definitions to the arch testarch FINALLY the git server is shut down - -Architecture validation Tests -============================= - - SCENARIO building a system with no architecture - GIVEN a git server - AND a system called base-system-noarch.morph with no architecture in the git server - WHEN the user clones definitions - AND the user attempts to build the system base-system-testarch.morph in branch master - THEN morph failed - FINALLY the git server is shut down diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn index 794c7c52..cce22f14 100644 --- a/yarns/implementations.yarn +++ b/yarns/implementations.yarn @@ -463,38 +463,6 @@ have a morphology using the test architecture. run_in "$DATADIR/gits/definitions" git add "$MATCH_1" run_in "$DATADIR/gits/definitions" git commit -m "Added $MATCH_1 and strata morphologies." -You need an architecture to build a system, we don't default to the host architecture. - - IMPLEMENTS GIVEN a system called (\S+) with no architecture in the git server - name="$(basename "${MATCH_1%.*}")" - cat << EOF > "$DATADIR/gits/definitions/$MATCH_1" - configuration-extensions: [] - description: A system called $name for test architecture - kind: system - name: $name - strata: - - name: build-essential - morph: strata/build-essential.morph - - name: core - morph: strata/core.morph - EOF - - run_in "$DATADIR/gits/definitions" git add "$MATCH_1" - run_in "$DATADIR/gits/definitions" git commit -m "Added $MATCH_1." - - IMPLEMENTS THEN the repo for chunk (\S+) was cloned into the directory (\S+) - if [[ -d "$DATADIR/$MATCH_2" ]]; then - exit 0 - fi - exit 1 - - IMPLEMENTS THEN the repo in directory (\S+) has HEAD (\S+) - cd "$DATADIR/$MATCH_1" - if [ "$MATCH_2" == `git rev-parse --abbrev-ref HEAD` ]; then - exit 0 - fi - exit 1 - To produce buildable morphologies, we need them to be of the same architecture as the machine doing the testing. This uses `morph print-architecture` to get a value appropriate for morph. -- cgit v1.2.1