summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtests.build/build-chunk-writes-log.script3
-rwxr-xr-xtests.build/build-stratum-with-submodules.script6
-rwxr-xr-xtests.build/build-system-cmake.script3
-rwxr-xr-xtests.build/build-system-cpan.script3
-rwxr-xr-xtests.build/build-system-python-distutils.script3
-rwxr-xr-xtests.build/build-system.script6
-rwxr-xr-xtests.build/morphless-chunks.script3
-rwxr-xr-xtests.build/prefix.script7
8 files changed, 23 insertions, 11 deletions
diff --git a/tests.build/build-chunk-writes-log.script b/tests.build/build-chunk-writes-log.script
index 56164bf5..5f257571 100755
--- a/tests.build/build-chunk-writes-log.script
+++ b/tests.build/build-chunk-writes-log.script
@@ -22,7 +22,8 @@ set -eu
"$SRCDIR/scripts/test-morph" build-morphology \
test:morphs-repo master hello-system
-chunks=$(find "$DATADIR/cache/artifacts/repo/refs/heads/" -name '*-misc' | sed -e "s:$DATADIR/cache/artifacts/repo/refs/heads/::" -e "s:-misc::")
+refsdir="$DATADIR/cache/artifacts/repo/refs/heads"
+chunks=$(find "$refsdir" -name '*-misc' | sed -e "s:$refsdir::" -e "s:-misc::")
found=false
for chunk in $chunks;
diff --git a/tests.build/build-stratum-with-submodules.script b/tests.build/build-stratum-with-submodules.script
index 36f6432b..d1daa292 100755
--- a/tests.build/build-stratum-with-submodules.script
+++ b/tests.build/build-stratum-with-submodules.script
@@ -68,6 +68,8 @@ cd "$DATADIR/workspace"
cd "$DATADIR/workspace/master/test/morphs-repo"
ref=`"$SRCDIR/scripts/test-morph" query-cache hello-system.morph`
-ostree --repo="$DATADIR/cache/artifacts/repo" checkout --fsync=false "$ref" "$DATADIR/$ref"
-find $DATADIR/$ref/* | sed "s:^$DATADIR/$ref/::" | LC_ALL=C sort | sed '/^\.\/./s:^\./::' | grep -v '^baserock'
+ostree --repo="$DATADIR/cache/artifacts/repo" checkout --fsync=false \
+ "$ref" "$DATADIR/$ref"
+find $DATADIR/$ref/* | sed "s:^$DATADIR/$ref/::" | LC_ALL=C sort |
+sed '/^\.\/./s:^\./::' | grep -v '^baserock'
diff --git a/tests.build/build-system-cmake.script b/tests.build/build-system-cmake.script
index 62227c3b..b761a5d5 100755
--- a/tests.build/build-system-cmake.script
+++ b/tests.build/build-system-cmake.script
@@ -58,6 +58,7 @@ cd "$DATADIR/workspace/master/test/morphs-repo"
refs=`"$SRCDIR/scripts/test-morph" query-cache hello-system.morph hello`
for ref in $refs
do
- ostree --repo="$DATADIR/cache/artifacts/repo" checkout --fsync=false "$ref" "$DATADIR/$ref"
+ ostree --repo="$DATADIR/cache/artifacts/repo" checkout --fsync=false \
+ "$ref" "$DATADIR/$ref"
find $DATADIR/$ref/* | sed "s:^$DATADIR/$ref/::"
done | LC_ALL=C sort -u | sed '/^\.\/./s:^\./::' | grep -Ee '^(usr/)?(bin|etc)'
diff --git a/tests.build/build-system-cpan.script b/tests.build/build-system-cpan.script
index 2dbbf54d..e6bd579c 100755
--- a/tests.build/build-system-cpan.script
+++ b/tests.build/build-system-cpan.script
@@ -80,6 +80,7 @@ cd "$DATADIR/workspace/master/test/morphs-repo"
refs=`"$SRCDIR/scripts/test-morph" query-cache hello-system.morph hello`
for ref in $refs
do
- ostree --repo="$DATADIR/cache/artifacts/repo" checkout --fsync=false "$ref" "$DATADIR/$ref"
+ ostree --repo="$DATADIR/cache/artifacts/repo" checkout --fsync=false \
+ "$ref" "$DATADIR/$ref"
find $DATADIR/$ref/* | sed "s:^$DATADIR/$ref/::"
done | LC_ALL=C sort | sed '/^\.\/./s:^\./::' | grep -F 'bin/hello'
diff --git a/tests.build/build-system-python-distutils.script b/tests.build/build-system-python-distutils.script
index a86f724e..44418655 100755
--- a/tests.build/build-system-python-distutils.script
+++ b/tests.build/build-system-python-distutils.script
@@ -78,7 +78,8 @@ cd "$DATADIR/workspace/master/test/morphs-repo"
refs=`"$SRCDIR/scripts/test-morph" query-cache hello-system.morph hello`
for ref in $refs
do
- ostree --repo="$DATADIR/cache/artifacts/repo" checkout --fsync=false "$ref" "$DATADIR/$ref"
+ ostree --repo="$DATADIR/cache/artifacts/repo" checkout --fsync=false \
+ "$ref" "$DATADIR/$ref"
find $DATADIR/$ref/* | sed "s:^$DATADIR/$ref/::"
done | LC_ALL=C sort -u | sed '/^\.\/./s:^\./::' | grep -Ee '^(bin|lib)' |
sed -e 's:^local/::' \
diff --git a/tests.build/build-system.script b/tests.build/build-system.script
index 18c1ae79..d3e338cf 100755
--- a/tests.build/build-system.script
+++ b/tests.build/build-system.script
@@ -29,5 +29,7 @@ cd "$DATADIR/workspace"
cd "$DATADIR/workspace/master/test/morphs-repo"
ref=`"$SRCDIR/scripts/test-morph" query-cache hello-system.morph`
-ostree --repo="$DATADIR/cache/artifacts/repo" checkout --fsync=false "$ref" "$DATADIR/$ref"
-find $DATADIR/$ref/* | sed "s:^$DATADIR/$ref/::" | LC_ALL=C sort | sed '/^\.\/./s:^\./::' | grep -v '^baserock'
+ostree --repo="$DATADIR/cache/artifacts/repo" checkout --fsync=false \
+ "$ref" "$DATADIR/$ref"
+find $DATADIR/$ref/* | sed "s:^$DATADIR/$ref/::" | LC_ALL=C sort |
+sed '/^\.\/./s:^\./::' | grep -v '^baserock'
diff --git a/tests.build/morphless-chunks.script b/tests.build/morphless-chunks.script
index 7ab09f7e..f0eb1518 100755
--- a/tests.build/morphless-chunks.script
+++ b/tests.build/morphless-chunks.script
@@ -50,5 +50,6 @@ cd "$DATADIR/workspace/master/test/morphs-repo"
refs=`"$SRCDIR/scripts/test-morph" query-cache hello-system.morph hello`
for ref in $refs
do
- ostree --repo="$DATADIR/cache/artifacts/repo" checkout --fsync=false "$ref" "$DATADIR/$ref"
+ ostree --repo="$DATADIR/cache/artifacts/repo" checkout --fsync=false \
+ "$ref" "$DATADIR/$ref"
done | cat >/dev/null
diff --git a/tests.build/prefix.script b/tests.build/prefix.script
index f8aa48a4..a87671c5 100755
--- a/tests.build/prefix.script
+++ b/tests.build/prefix.script
@@ -72,7 +72,10 @@ cd "$DATADIR/workspace"
"$SRCDIR/scripts/test-morph" checkout test:morphs-repo master
cd "$DATADIR/workspace/master/test/morphs-repo"
-first_chunk=$("$SRCDIR/scripts/test-morph" query-cache hello-system.morph xyzzy | head -n1 | cut -c -64)
-second_chunk=$("$SRCDIR/scripts/test-morph" query-cache hello-system.morph plugh | head -n1 | cut -c -64)
+test_morph="$SRCDIR/scripts/test-morph"
+first_chunk=$("$test_morph" query-cache hello-system.morph xyzzy | head -n1 |
+ cut -c -64)
+second_chunk=$("$test_morph" query-cache hello-system.morph plugh | head -n1 |
+ cut -c -64)
cd "$DATADIR/cache/artifacts"
cat $first_chunk.build-log $second_chunk.build-log