From fa5d709fb266c97d4db15006bf855e887a6c123b Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Tue, 17 Dec 2019 13:33:58 -0500 Subject: ci: Move wrap-qemu into separate script --- ci/test/06_script_b.sh | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'ci/test/06_script_b.sh') diff --git a/ci/test/06_script_b.sh b/ci/test/06_script_b.sh index e641cef279..139894e7c6 100755 --- a/ci/test/06_script_b.sh +++ b/ci/test/06_script_b.sh @@ -11,16 +11,7 @@ if [ -n "$QEMU_USER_CMD" ]; then # Generate all binaries, so that they can be wrapped DOCKER_EXEC make $MAKEJOBS -C src/secp256k1 VERBOSE=1 DOCKER_EXEC make $MAKEJOBS -C src/univalue VERBOSE=1 - for b_name in {"${BASE_OUTDIR}/bin"/*,src/secp256k1/*tests,src/univalue/{no_nul,test_json,unitester,object}}; do - # shellcheck disable=SC2044 - for b in $(find "${BASE_ROOT_DIR}" -executable -type f -name $(basename $b_name)); do - echo "Wrap $b ..." - DOCKER_EXEC mv "$b" "${b}_orig" - DOCKER_EXEC echo "\#\!/usr/bin/env bash" \> "$b" - DOCKER_EXEC echo "$QEMU_USER_CMD \\\"${b}_orig\\\" \\\"\\\$@\\\"" \>\> "$b" - DOCKER_EXEC chmod +x "$b" - done - done + DOCKER_EXEC "${BASE_ROOT_DIR}/ci/test/wrap-qemu.sh" END_FOLD fi -- cgit v1.2.3