From 447d08989906423132d3f99659dd8646927c08d4 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Thu, 21 Jul 2016 21:47:25 -0700 Subject: [PATCH] test_runtime.sh: Drop pushd/popd from around 'generate' The switch to --output in 06d61a34 (generate: Add --output=PATH and write to stdout by default, 2016-07-05, #129) was too narrow. There's no need to change directories now that the output path is configurable. Signed-off-by: W. Trevor King --- test_runtime.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test_runtime.sh b/test_runtime.sh index b7746fcee..c4d0691f9 100755 --- a/test_runtime.sh +++ b/test_runtime.sh @@ -77,9 +77,7 @@ trap cleanup EXIT tar -xf rootfs.tar.gz -C ${TESTDIR} cp runtimetest ${TESTDIR} -pushd $TESTDIR > /dev/null -ocitools generate --output config.json "${TEST_ARGS[@]}" --rootfs '.' -popd > /dev/null +ocitools generate --output "${TESTDIR}/config.json" "${TEST_ARGS[@]}" --rootfs '.' TESTCMD="${RUNTIME} start $(uuidgen)" pushd $TESTDIR > /dev/null