summaryrefslogtreecommitdiff
path: root/yarns
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2014-03-06 15:59:09 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2014-03-06 19:34:55 +0000
commitd130f9e1a369236952f7881bdbbbaa0c54c73fb9 (patch)
tree0e8efe4834083d5f4083e7e792259c58a850a8f5 /yarns
parentb3a92a22969b5131aacd7294a3105507125cc3ab (diff)
downloadmorph-d130f9e1a369236952f7881bdbbbaa0c54c73fb9.tar.gz
Fix pathname (colon to slash) in test implementations
Diffstat (limited to 'yarns')
-rw-r--r--yarns/implementations.yarn42
1 files changed, 21 insertions, 21 deletions
diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn
index 1e1b2fd5..276ed2f3 100644
--- a/yarns/implementations.yarn
+++ b/yarns/implementations.yarn
@@ -340,9 +340,9 @@ Attempt to check out a system branch from a root that has no systems.
We also need to verify that a system branch has been checked out.
IMPLEMENTS THEN the system branch (\S+) is checked out
- is_dir "$DATADIR/workspace/$MATCH_1/test:morphs"
- is_file "$DATADIR/workspace/$MATCH_1/test:morphs/test-system.morph"
- is_file "$DATADIR/workspace/$MATCH_1/test:morphs/test-stratum.morph"
+ is_dir "$DATADIR/workspace/$MATCH_1/test/morphs"
+ is_file "$DATADIR/workspace/$MATCH_1/test/morphs/test-system.morph"
+ is_file "$DATADIR/workspace/$MATCH_1/test/morphs/test-stratum.morph"
We can create a new branch, off master.
@@ -368,7 +368,7 @@ Pushing all changes in a system branch checkout to the git server.
IMPLEMENTS WHEN the user pushes the system branch called (\S+) to the git server
# FIXME: For now, this is just the morphs checkout.
- run_in "$DATADIR/workspace/$MATCH_1/test:morphs" git push origin HEAD
+ run_in "$DATADIR/workspace/$MATCH_1/test/morphs" git push origin HEAD
Report workspace path.
@@ -411,7 +411,7 @@ Editing morphologies with `morph edit`.
IMPLEMENTS THEN in branch (\S+), stratum (\S+) refs (\S+) in (\S+)
"$SRCDIR/scripts/yaml-extract" \
- "$DATADIR/workspace/$MATCH_1/test:morphs/$MATCH_2.morph" \
+ "$DATADIR/workspace/$MATCH_1/test/morphs/$MATCH_2.morph" \
chunks name="$MATCH_3" ref > "$DATADIR/ref.actual"
echo "$MATCH_4" > "$DATADIR/ref.wanted"
diff -u "$DATADIR/ref.wanted" "$DATADIR/ref.actual"
@@ -419,16 +419,16 @@ Editing morphologies with `morph edit`.
IMPLEMENTS THEN in branch (\S+), (system|stratum) (\S+) refers to (\S+) without (\S+)
if [ $MATCH_2 == system ]; then field=strata; else field=build-depends; fi
{ ! "$SRCDIR/scripts/yaml-extract" \
- "$DATADIR/workspace/$MATCH_1/test:morphs/$MATCH_3.morph" \
+ "$DATADIR/workspace/$MATCH_1/test/morphs/$MATCH_3.morph" \
"$field" name="$MATCH_4" "$MATCH_5"; } 2>&1 |
grep -qFe "Object does not contain $MATCH_5"
IMPLEMENTS WHEN the user edits the stratum (\S+) in the system (\S+) in branch (\S+)
- cd "$DATADIR/workspace/$MATCH_3/test:morphs"
+ cd "$DATADIR/workspace/$MATCH_3/test/morphs"
run_morph edit "$MATCH_2" "$MATCH_1"
IMPLEMENTS WHEN the user edits the chunk (\S+) in the stratum (\S+) in the system (\S+) in branch (\S+)
- cd "$DATADIR/workspace/$MATCH_4/test:morphs"
+ cd "$DATADIR/workspace/$MATCH_4/test/morphs"
run_morph edit "$MATCH_3" "$MATCH_2" "$MATCH_1"
IMPLEMENTS THEN the edited chunk (\S+) has git branch (\S+)
@@ -448,7 +448,7 @@ print-architecture` to get a value appropriate for morph.
IMPLEMENTS WHEN the user creates an uncommitted system morphology called (\S+) for our architecture in system branch (\S+)
arch=$(morph print-architecture)
- cat << EOF > "$DATADIR/workspace/$MATCH_2/test:morphs/$MATCH_1.morph"
+ cat << EOF > "$DATADIR/workspace/$MATCH_2/test/morphs/$MATCH_1.morph"
arch: $arch
configuration-extensions: []
description: A system called $MATCH_1 for architectures $arch
@@ -514,11 +514,11 @@ Running shell command in each checked out repository:
Petrification and unpetrification:
IMPLEMENTS WHEN remembering all refs in (\S+)
- cd "$DATADIR/workspace/$MATCH_1/test:morphs"
+ cd "$DATADIR/workspace/$MATCH_1/test/morphs"
list_refs *.morph > "$DATADIR/refs.remembered"
IMPLEMENTS THEN (\S+) refs are as remembered
- cd "$DATADIR/workspace/$MATCH_1/test:morphs"
+ cd "$DATADIR/workspace/$MATCH_1/test/morphs"
# FIXME: petrify/unpetrify doesn't work quite right at this time:
# petrify can change a ref to a stratum to point at the system
@@ -548,41 +548,41 @@ Petrification and unpetrification:
done
IMPLEMENTS WHEN petrifying (\S+)
- cd "$DATADIR/workspace/$MATCH_1/test:morphs"
+ cd "$DATADIR/workspace/$MATCH_1/test/morphs"
run_morph petrify
IMPLEMENTS WHEN unpetrifying (\S+)
- cd "$DATADIR/workspace/$MATCH_1/test:morphs"
+ cd "$DATADIR/workspace/$MATCH_1/test/morphs"
run_morph unpetrify
IMPLEMENTS THEN (\S+) is petrified
- cd "$DATADIR/workspace/$MATCH_1/test:morphs"
+ cd "$DATADIR/workspace/$MATCH_1/test/morphs"
assert_morphologies_are_petrified "$MATCH_1" *.morph
IMPLEMENTS THEN (\S+) is not petrified
- cd "$DATADIR/workspace/$MATCH_1/test:morphs"
+ cd "$DATADIR/workspace/$MATCH_1/test/morphs"
! assert_morphologies_are_petrified "$MATCH_1" *.morph
Tagging.
IMPLEMENTS WHEN the user tags the system branch called (\S+) as (\S+)
- cd "$DATADIR/workspace/$MATCH_1/test:morphs"
+ cd "$DATADIR/workspace/$MATCH_1/test/morphs"
set tag "$MATCH_2" -- -m "testing morph tagging"
run_morph tag "$MATCH_2" -- -m "testing morph tagging"
IMPLEMENTS WHEN the user attempts to tag the system branch called (\S+) as (\S+)
- cd "$DATADIR/workspace/$MATCH_1/test:morphs"
+ cd "$DATADIR/workspace/$MATCH_1/test/morphs"
attempt_morph tag "$MATCH_2" -- -m "testing morph tagging"
IMPLEMENTS THEN morph tag (\S+) in (\S+) is an annotated git tag
- cd "$DATADIR/workspace/$MATCH_2/test:morphs"
+ cd "$DATADIR/workspace/$MATCH_2/test/morphs"
if git show "$MATCH_1" | head -n1 | grep -v '^tag '
then
die "git tag $MATCH_1 is not an annotated tag"
fi
IMPLEMENTS THEN morph tag (\S+) in (\S+) refers to a petrified commit
- cd "$DATADIR/workspace/$MATCH_2/test:morphs"
+ cd "$DATADIR/workspace/$MATCH_2/test/morphs"
git ls-tree "$MATCH_1" |
awk '$NF ~ /\.morph$/ { print $NF }' |
while read x
@@ -682,7 +682,7 @@ with only the minimal information.
system="$MATCH_2"
type="$MATCH_3"
branch="$MATCH_4"
- cat << EOF > "$DATADIR/workspace/$branch/test:morphs/$name.morph"
+ cat << EOF > "$DATADIR/workspace/$branch/test/morphs/$name.morph"
name: $name
kind: cluster
systems:
@@ -816,6 +816,6 @@ Altering morphologies in the workspace
--------------------------------------
IMPLEMENTS GIVEN stratum (\S+) in system branch (\S+) has match rules: (.*)
- cd "$DATADIR/workspace/$MATCH_2/test:morphs"
+ cd "$DATADIR/workspace/$MATCH_2/test/morphs"
"$SRCDIR/scripts/edit-morph" set-stratum-match-rules \
"$MATCH_1.morph" "$MATCH_3"