summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-03-14 16:43:16 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2014-03-14 17:07:43 +0000
commita0cf62b0152b68cd85ae69b47edc2745044e2353 (patch)
tree5ceb257d1d81063bb7c404efb3c21531c4cf0353
parent8f1fe553d47003ea1043c5e57e3bed4beeb95bde (diff)
downloadmorph-a0cf62b0152b68cd85ae69b47edc2745044e2353.tar.gz
Allow run-in-artifact cmdtest to pass on x86_32
This hard-coded the expected artifact key, which is dependent on architecture. Since we don't care about the output, so much as it failing, let's just discard it.
-rwxr-xr-xtests.as-root/run-in-artifact-with-different-artifacts.script2
-rw-r--r--tests.as-root/run-in-artifact-with-different-artifacts.stderr1
2 files changed, 1 insertions, 2 deletions
diff --git a/tests.as-root/run-in-artifact-with-different-artifacts.script b/tests.as-root/run-in-artifact-with-different-artifacts.script
index ff944af4..57d408e3 100755
--- a/tests.as-root/run-in-artifact-with-different-artifacts.script
+++ b/tests.as-root/run-in-artifact-with-different-artifacts.script
@@ -44,4 +44,4 @@ echo
# Run 'run-in-artifact' with the statum artifact.
echo "Stratum:"
"$SRCDIR/scripts/test-morph" run-in-artifact "$stratum" -- ls baserock/ \
- || echo "Failed"
+ 2>/dev/null || echo "Failed"
diff --git a/tests.as-root/run-in-artifact-with-different-artifacts.stderr b/tests.as-root/run-in-artifact-with-different-artifacts.stderr
deleted file mode 100644
index 9241fbb5..00000000
--- a/tests.as-root/run-in-artifact-with-different-artifacts.stderr
+++ /dev/null
@@ -1 +0,0 @@
-ERROR: Artifact TMP/cache/artifacts/e8e771e742c8f2199bd9f1e29cbeca07dbd51dd8880136d6521093711d37d8bf.stratum.linux-stratum-runtime cannot be extracted or mounted