From a0cf62b0152b68cd85ae69b47edc2745044e2353 Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Fri, 14 Mar 2014 16:43:16 +0000 Subject: 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. --- tests.as-root/run-in-artifact-with-different-artifacts.script | 2 +- tests.as-root/run-in-artifact-with-different-artifacts.stderr | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 tests.as-root/run-in-artifact-with-different-artifacts.stderr 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 -- cgit v1.2.1