From 2e356e7d9b73dc28463487de20c3030f520e68e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Sch=C3=BCtt?= Date: Wed, 30 Aug 2023 19:22:33 +0200 Subject: [PATCH] Docker: Fix quoting of TESTOPTS --- tools/docker/Dockerfile.prod_cuda_A100 | 2 +- tools/docker/Dockerfile.prod_cuda_P100 | 2 +- tools/docker/Dockerfile.prod_cuda_V100 | 2 +- tools/docker/Dockerfile.prod_generic_pdbg | 2 +- tools/docker/Dockerfile.prod_generic_psmp | 2 +- tools/docker/Dockerfile.prod_generic_sdbg | 2 +- tools/docker/Dockerfile.prod_generic_ssmp | 2 +- tools/docker/Dockerfile.prod_intel_psmp | 2 +- tools/docker/Dockerfile.prod_pdbg | 2 +- tools/docker/Dockerfile.prod_psmp | 2 +- tools/docker/Dockerfile.prod_sdbg | 2 +- tools/docker/Dockerfile.prod_ssmp | 2 +- tools/docker/Dockerfile.test_arm64-psmp | 2 +- tools/docker/Dockerfile.test_asan-psmp | 2 +- tools/docker/Dockerfile.test_asan-ssmp | 2 +- tools/docker/Dockerfile.test_cuda_A100 | 2 +- tools/docker/Dockerfile.test_cuda_P100 | 2 +- tools/docker/Dockerfile.test_cuda_V100 | 2 +- tools/docker/Dockerfile.test_fedora-psmp | 2 +- tools/docker/Dockerfile.test_gcc10 | 2 +- tools/docker/Dockerfile.test_gcc11 | 2 +- tools/docker/Dockerfile.test_gcc12 | 2 +- tools/docker/Dockerfile.test_gcc8 | 2 +- tools/docker/Dockerfile.test_gcc9 | 2 +- tools/docker/Dockerfile.test_generic_pdbg | 2 +- tools/docker/Dockerfile.test_generic_psmp | 2 +- tools/docker/Dockerfile.test_generic_sdbg | 2 +- tools/docker/Dockerfile.test_generic_ssmp | 2 +- tools/docker/Dockerfile.test_hip_cuda_A100 | 2 +- tools/docker/Dockerfile.test_hip_cuda_P100 | 2 +- tools/docker/Dockerfile.test_hip_cuda_V100 | 2 +- tools/docker/Dockerfile.test_i386 | 2 +- tools/docker/Dockerfile.test_intel-psmp | 2 +- tools/docker/Dockerfile.test_minimal | 2 +- tools/docker/Dockerfile.test_openmpi-psmp | 2 +- tools/docker/Dockerfile.test_pdbg | 2 +- tools/docker/Dockerfile.test_psmp | 2 +- tools/docker/Dockerfile.test_sdbg | 2 +- tools/docker/Dockerfile.test_ssmp | 2 +- tools/docker/generate_dockerfiles.py | 4 ++-- 40 files changed, 41 insertions(+), 41 deletions(-) diff --git a/tools/docker/Dockerfile.prod_cuda_A100 b/tools/docker/Dockerfile.prod_cuda_A100 index d1fba7f173..d5cb3b60db 100644 --- a/tools/docker/Dockerfile.prod_cuda_A100 +++ b/tools/docker/Dockerfile.prod_cuda_A100 @@ -104,7 +104,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS RUN /bin/bash -c " \ source /opt/cp2k-toolchain/install/setup && \ - ./tools/regtesting/do_regtest.py 'local_cuda' 'psmp' --skipdir=UNIT/libcp2k_unittest "${TESTOPTS}" |& tee regtests.log && \ + ./tools/regtesting/do_regtest.py 'local_cuda' 'psmp' --skipdir=UNIT/libcp2k_unittest '${TESTOPTS}' |& tee regtests.log && \ rm -rf regtesting" # Setup entry point for production. diff --git a/tools/docker/Dockerfile.prod_cuda_P100 b/tools/docker/Dockerfile.prod_cuda_P100 index 1174f67a23..31df78f1e1 100644 --- a/tools/docker/Dockerfile.prod_cuda_P100 +++ b/tools/docker/Dockerfile.prod_cuda_P100 @@ -104,7 +104,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS RUN /bin/bash -c " \ source /opt/cp2k-toolchain/install/setup && \ - ./tools/regtesting/do_regtest.py 'local_cuda' 'psmp' --skipdir=UNIT/libcp2k_unittest "${TESTOPTS}" |& tee regtests.log && \ + ./tools/regtesting/do_regtest.py 'local_cuda' 'psmp' --skipdir=UNIT/libcp2k_unittest '${TESTOPTS}' |& tee regtests.log && \ rm -rf regtesting" # Setup entry point for production. diff --git a/tools/docker/Dockerfile.prod_cuda_V100 b/tools/docker/Dockerfile.prod_cuda_V100 index a363371482..d9bb3d72a3 100644 --- a/tools/docker/Dockerfile.prod_cuda_V100 +++ b/tools/docker/Dockerfile.prod_cuda_V100 @@ -104,7 +104,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS RUN /bin/bash -c " \ source /opt/cp2k-toolchain/install/setup && \ - ./tools/regtesting/do_regtest.py 'local_cuda' 'psmp' --skipdir=UNIT/libcp2k_unittest "${TESTOPTS}" |& tee regtests.log && \ + ./tools/regtesting/do_regtest.py 'local_cuda' 'psmp' --skipdir=UNIT/libcp2k_unittest '${TESTOPTS}' |& tee regtests.log && \ rm -rf regtesting" # Setup entry point for production. diff --git a/tools/docker/Dockerfile.prod_generic_pdbg b/tools/docker/Dockerfile.prod_generic_pdbg index 8c5e25aa69..0b10358fe6 100644 --- a/tools/docker/Dockerfile.prod_generic_pdbg +++ b/tools/docker/Dockerfile.prod_generic_pdbg @@ -89,7 +89,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS RUN /bin/bash -c " \ source /opt/cp2k-toolchain/install/setup && \ - ./tools/regtesting/do_regtest.py 'local' 'pdbg' --skipdir=UNIT/libcp2k_unittest "${TESTOPTS}" |& tee regtests.log && \ + ./tools/regtesting/do_regtest.py 'local' 'pdbg' --skipdir=UNIT/libcp2k_unittest '${TESTOPTS}' |& tee regtests.log && \ rm -rf regtesting" # Setup entry point for production. diff --git a/tools/docker/Dockerfile.prod_generic_psmp b/tools/docker/Dockerfile.prod_generic_psmp index e71f5fbd84..f3a97a9ee4 100644 --- a/tools/docker/Dockerfile.prod_generic_psmp +++ b/tools/docker/Dockerfile.prod_generic_psmp @@ -89,7 +89,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS RUN /bin/bash -c " \ source /opt/cp2k-toolchain/install/setup && \ - ./tools/regtesting/do_regtest.py 'local' 'psmp' --skipdir=UNIT/libcp2k_unittest "${TESTOPTS}" |& tee regtests.log && \ + ./tools/regtesting/do_regtest.py 'local' 'psmp' --skipdir=UNIT/libcp2k_unittest '${TESTOPTS}' |& tee regtests.log && \ rm -rf regtesting" # Setup entry point for production. diff --git a/tools/docker/Dockerfile.prod_generic_sdbg b/tools/docker/Dockerfile.prod_generic_sdbg index 27a727d67d..70f94cb18f 100644 --- a/tools/docker/Dockerfile.prod_generic_sdbg +++ b/tools/docker/Dockerfile.prod_generic_sdbg @@ -88,7 +88,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS RUN /bin/bash -c " \ source /opt/cp2k-toolchain/install/setup && \ - ./tools/regtesting/do_regtest.py 'local' 'sdbg' --skipdir=UNIT/libcp2k_unittest "${TESTOPTS}" |& tee regtests.log && \ + ./tools/regtesting/do_regtest.py 'local' 'sdbg' --skipdir=UNIT/libcp2k_unittest '${TESTOPTS}' |& tee regtests.log && \ rm -rf regtesting" # Setup entry point for production. diff --git a/tools/docker/Dockerfile.prod_generic_ssmp b/tools/docker/Dockerfile.prod_generic_ssmp index 65ab4ecb47..371cbb4a2c 100644 --- a/tools/docker/Dockerfile.prod_generic_ssmp +++ b/tools/docker/Dockerfile.prod_generic_ssmp @@ -88,7 +88,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS RUN /bin/bash -c " \ source /opt/cp2k-toolchain/install/setup && \ - ./tools/regtesting/do_regtest.py 'local' 'ssmp' --skipdir=UNIT/libcp2k_unittest "${TESTOPTS}" |& tee regtests.log && \ + ./tools/regtesting/do_regtest.py 'local' 'ssmp' --skipdir=UNIT/libcp2k_unittest '${TESTOPTS}' |& tee regtests.log && \ rm -rf regtesting" # Setup entry point for production. diff --git a/tools/docker/Dockerfile.prod_intel_psmp b/tools/docker/Dockerfile.prod_intel_psmp index d4840bfef7..f6ef537cfe 100644 --- a/tools/docker/Dockerfile.prod_intel_psmp +++ b/tools/docker/Dockerfile.prod_intel_psmp @@ -90,7 +90,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS RUN /bin/bash -c " \ source /opt/cp2k-toolchain/install/setup && \ - ./tools/regtesting/do_regtest.py 'Linux-intel-x86_64' 'psmp' --skipdir=UNIT/libcp2k_unittest "${TESTOPTS}" |& tee regtests.log && \ + ./tools/regtesting/do_regtest.py 'Linux-intel-x86_64' 'psmp' --skipdir=UNIT/libcp2k_unittest '${TESTOPTS}' |& tee regtests.log && \ rm -rf regtesting" # Setup entry point for production. diff --git a/tools/docker/Dockerfile.prod_pdbg b/tools/docker/Dockerfile.prod_pdbg index add0083040..2057ef58e0 100644 --- a/tools/docker/Dockerfile.prod_pdbg +++ b/tools/docker/Dockerfile.prod_pdbg @@ -88,7 +88,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS RUN /bin/bash -c " \ source /opt/cp2k-toolchain/install/setup && \ - ./tools/regtesting/do_regtest.py 'local' 'pdbg' --skipdir=UNIT/libcp2k_unittest "${TESTOPTS}" |& tee regtests.log && \ + ./tools/regtesting/do_regtest.py 'local' 'pdbg' --skipdir=UNIT/libcp2k_unittest '${TESTOPTS}' |& tee regtests.log && \ rm -rf regtesting" # Setup entry point for production. diff --git a/tools/docker/Dockerfile.prod_psmp b/tools/docker/Dockerfile.prod_psmp index 2783f595ef..108c146299 100644 --- a/tools/docker/Dockerfile.prod_psmp +++ b/tools/docker/Dockerfile.prod_psmp @@ -88,7 +88,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS RUN /bin/bash -c " \ source /opt/cp2k-toolchain/install/setup && \ - ./tools/regtesting/do_regtest.py 'local' 'psmp' --skipdir=UNIT/libcp2k_unittest "${TESTOPTS}" |& tee regtests.log && \ + ./tools/regtesting/do_regtest.py 'local' 'psmp' --skipdir=UNIT/libcp2k_unittest '${TESTOPTS}' |& tee regtests.log && \ rm -rf regtesting" # Setup entry point for production. diff --git a/tools/docker/Dockerfile.prod_sdbg b/tools/docker/Dockerfile.prod_sdbg index 00359731d9..eeb0f08ccd 100644 --- a/tools/docker/Dockerfile.prod_sdbg +++ b/tools/docker/Dockerfile.prod_sdbg @@ -87,7 +87,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS RUN /bin/bash -c " \ source /opt/cp2k-toolchain/install/setup && \ - ./tools/regtesting/do_regtest.py 'local' 'sdbg' --skipdir=UNIT/libcp2k_unittest "${TESTOPTS}" |& tee regtests.log && \ + ./tools/regtesting/do_regtest.py 'local' 'sdbg' --skipdir=UNIT/libcp2k_unittest '${TESTOPTS}' |& tee regtests.log && \ rm -rf regtesting" # Setup entry point for production. diff --git a/tools/docker/Dockerfile.prod_ssmp b/tools/docker/Dockerfile.prod_ssmp index b00ef6c625..fa0b12f220 100644 --- a/tools/docker/Dockerfile.prod_ssmp +++ b/tools/docker/Dockerfile.prod_ssmp @@ -87,7 +87,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS RUN /bin/bash -c " \ source /opt/cp2k-toolchain/install/setup && \ - ./tools/regtesting/do_regtest.py 'local' 'ssmp' --skipdir=UNIT/libcp2k_unittest "${TESTOPTS}" |& tee regtests.log && \ + ./tools/regtesting/do_regtest.py 'local' 'ssmp' --skipdir=UNIT/libcp2k_unittest '${TESTOPTS}' |& tee regtests.log && \ rm -rf regtesting" # Setup entry point for production. diff --git a/tools/docker/Dockerfile.test_arm64-psmp b/tools/docker/Dockerfile.test_arm64-psmp index 2e1f65eaba..5b838a95dd 100644 --- a/tools/docker/Dockerfile.test_arm64-psmp +++ b/tools/docker/Dockerfile.test_arm64-psmp @@ -83,7 +83,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS="" COPY ./tools/docker/scripts/test_regtest.sh ./ RUN /bin/bash -o pipefail -c " \ - TESTOPTS="${TESTOPTS}" \ + TESTOPTS='${TESTOPTS}' \ ./test_regtest.sh 'local' 'psmp' |& tee report.log && \ rm -rf regtesting" diff --git a/tools/docker/Dockerfile.test_asan-psmp b/tools/docker/Dockerfile.test_asan-psmp index 3cc8c61d63..3c2be95b50 100644 --- a/tools/docker/Dockerfile.test_asan-psmp +++ b/tools/docker/Dockerfile.test_asan-psmp @@ -81,7 +81,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS="" COPY ./tools/docker/scripts/test_regtest.sh ./ RUN /bin/bash -o pipefail -c " \ - TESTOPTS="${TESTOPTS}" \ + TESTOPTS='${TESTOPTS}' \ ./test_regtest.sh 'local_asan' 'psmp' |& tee report.log && \ rm -rf regtesting" diff --git a/tools/docker/Dockerfile.test_asan-ssmp b/tools/docker/Dockerfile.test_asan-ssmp index 99de5dda84..3c3d64bb69 100644 --- a/tools/docker/Dockerfile.test_asan-ssmp +++ b/tools/docker/Dockerfile.test_asan-ssmp @@ -80,7 +80,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS="" COPY ./tools/docker/scripts/test_regtest.sh ./ RUN /bin/bash -o pipefail -c " \ - TESTOPTS="${TESTOPTS}" \ + TESTOPTS='${TESTOPTS}' \ ./test_regtest.sh 'local_asan' 'ssmp' |& tee report.log && \ rm -rf regtesting" diff --git a/tools/docker/Dockerfile.test_cuda_A100 b/tools/docker/Dockerfile.test_cuda_A100 index 8468ef1827..b19a198693 100644 --- a/tools/docker/Dockerfile.test_cuda_A100 +++ b/tools/docker/Dockerfile.test_cuda_A100 @@ -97,7 +97,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS="" COPY ./tools/docker/scripts/test_regtest.sh ./ RUN /bin/bash -o pipefail -c " \ - TESTOPTS="${TESTOPTS}" \ + TESTOPTS='${TESTOPTS}' \ ./test_regtest.sh 'local_cuda' 'psmp' |& tee report.log && \ rm -rf regtesting" diff --git a/tools/docker/Dockerfile.test_cuda_P100 b/tools/docker/Dockerfile.test_cuda_P100 index e3e35cd666..f854744221 100644 --- a/tools/docker/Dockerfile.test_cuda_P100 +++ b/tools/docker/Dockerfile.test_cuda_P100 @@ -97,7 +97,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS="" COPY ./tools/docker/scripts/test_regtest.sh ./ RUN /bin/bash -o pipefail -c " \ - TESTOPTS="${TESTOPTS}" \ + TESTOPTS='${TESTOPTS}' \ ./test_regtest.sh 'local_cuda' 'psmp' |& tee report.log && \ rm -rf regtesting" diff --git a/tools/docker/Dockerfile.test_cuda_V100 b/tools/docker/Dockerfile.test_cuda_V100 index 15c84fc153..c7881de011 100644 --- a/tools/docker/Dockerfile.test_cuda_V100 +++ b/tools/docker/Dockerfile.test_cuda_V100 @@ -97,7 +97,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS="" COPY ./tools/docker/scripts/test_regtest.sh ./ RUN /bin/bash -o pipefail -c " \ - TESTOPTS="${TESTOPTS}" \ + TESTOPTS='${TESTOPTS}' \ ./test_regtest.sh 'local_cuda' 'psmp' |& tee report.log && \ rm -rf regtesting" diff --git a/tools/docker/Dockerfile.test_fedora-psmp b/tools/docker/Dockerfile.test_fedora-psmp index a6f4a9bad1..8402530596 100644 --- a/tools/docker/Dockerfile.test_fedora-psmp +++ b/tools/docker/Dockerfile.test_fedora-psmp @@ -81,7 +81,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS="" COPY ./tools/docker/scripts/test_regtest.sh ./ RUN /bin/bash -o pipefail -c " \ - TESTOPTS="${TESTOPTS}" \ + TESTOPTS='${TESTOPTS}' \ ./test_regtest.sh 'local' 'psmp' |& tee report.log && \ rm -rf regtesting" diff --git a/tools/docker/Dockerfile.test_gcc10 b/tools/docker/Dockerfile.test_gcc10 index 55c308b263..50bb375179 100644 --- a/tools/docker/Dockerfile.test_gcc10 +++ b/tools/docker/Dockerfile.test_gcc10 @@ -109,7 +109,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS="--skipdir=QS/regtest-rs-dhft" COPY ./tools/docker/scripts/test_regtest.sh ./ RUN /bin/bash -o pipefail -c " \ - TESTOPTS="${TESTOPTS}" \ + TESTOPTS='${TESTOPTS}' \ ./test_regtest.sh 'local' 'ssmp' |& tee report.log && \ rm -rf regtesting" diff --git a/tools/docker/Dockerfile.test_gcc11 b/tools/docker/Dockerfile.test_gcc11 index 775c06c22b..2e1f788d16 100644 --- a/tools/docker/Dockerfile.test_gcc11 +++ b/tools/docker/Dockerfile.test_gcc11 @@ -109,7 +109,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS="--skipdir=QS/regtest-rs-dhft" COPY ./tools/docker/scripts/test_regtest.sh ./ RUN /bin/bash -o pipefail -c " \ - TESTOPTS="${TESTOPTS}" \ + TESTOPTS='${TESTOPTS}' \ ./test_regtest.sh 'local' 'ssmp' |& tee report.log && \ rm -rf regtesting" diff --git a/tools/docker/Dockerfile.test_gcc12 b/tools/docker/Dockerfile.test_gcc12 index 4dc52d5c33..b2bf8edd8d 100644 --- a/tools/docker/Dockerfile.test_gcc12 +++ b/tools/docker/Dockerfile.test_gcc12 @@ -109,7 +109,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS="--skipdir=QS/regtest-rs-dhft" COPY ./tools/docker/scripts/test_regtest.sh ./ RUN /bin/bash -o pipefail -c " \ - TESTOPTS="${TESTOPTS}" \ + TESTOPTS='${TESTOPTS}' \ ./test_regtest.sh 'local' 'ssmp' |& tee report.log && \ rm -rf regtesting" diff --git a/tools/docker/Dockerfile.test_gcc8 b/tools/docker/Dockerfile.test_gcc8 index bf9aac9389..7bdd5ad782 100644 --- a/tools/docker/Dockerfile.test_gcc8 +++ b/tools/docker/Dockerfile.test_gcc8 @@ -107,7 +107,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS="--skipdir=QS/regtest-rs-dhft" COPY ./tools/docker/scripts/test_regtest.sh ./ RUN /bin/bash -o pipefail -c " \ - TESTOPTS="${TESTOPTS}" \ + TESTOPTS='${TESTOPTS}' \ ./test_regtest.sh 'local' 'ssmp' |& tee report.log && \ rm -rf regtesting" diff --git a/tools/docker/Dockerfile.test_gcc9 b/tools/docker/Dockerfile.test_gcc9 index c5d38b2b60..65739764c4 100644 --- a/tools/docker/Dockerfile.test_gcc9 +++ b/tools/docker/Dockerfile.test_gcc9 @@ -109,7 +109,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS="--skipdir=QS/regtest-rs-dhft" COPY ./tools/docker/scripts/test_regtest.sh ./ RUN /bin/bash -o pipefail -c " \ - TESTOPTS="${TESTOPTS}" \ + TESTOPTS='${TESTOPTS}' \ ./test_regtest.sh 'local' 'ssmp' |& tee report.log && \ rm -rf regtesting" diff --git a/tools/docker/Dockerfile.test_generic_pdbg b/tools/docker/Dockerfile.test_generic_pdbg index aa401891ed..11cfc262da 100644 --- a/tools/docker/Dockerfile.test_generic_pdbg +++ b/tools/docker/Dockerfile.test_generic_pdbg @@ -82,7 +82,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS="" COPY ./tools/docker/scripts/test_regtest.sh ./ RUN /bin/bash -o pipefail -c " \ - TESTOPTS="${TESTOPTS}" \ + TESTOPTS='${TESTOPTS}' \ ./test_regtest.sh 'local' 'pdbg' |& tee report.log && \ rm -rf regtesting" diff --git a/tools/docker/Dockerfile.test_generic_psmp b/tools/docker/Dockerfile.test_generic_psmp index 860598e4a9..aef01d40fe 100644 --- a/tools/docker/Dockerfile.test_generic_psmp +++ b/tools/docker/Dockerfile.test_generic_psmp @@ -82,7 +82,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS="" COPY ./tools/docker/scripts/test_regtest.sh ./ RUN /bin/bash -o pipefail -c " \ - TESTOPTS="${TESTOPTS}" \ + TESTOPTS='${TESTOPTS}' \ ./test_regtest.sh 'local' 'psmp' |& tee report.log && \ rm -rf regtesting" diff --git a/tools/docker/Dockerfile.test_generic_sdbg b/tools/docker/Dockerfile.test_generic_sdbg index 4d5774ba40..c13f6d8f52 100644 --- a/tools/docker/Dockerfile.test_generic_sdbg +++ b/tools/docker/Dockerfile.test_generic_sdbg @@ -81,7 +81,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS="" COPY ./tools/docker/scripts/test_regtest.sh ./ RUN /bin/bash -o pipefail -c " \ - TESTOPTS="${TESTOPTS}" \ + TESTOPTS='${TESTOPTS}' \ ./test_regtest.sh 'local' 'sdbg' |& tee report.log && \ rm -rf regtesting" diff --git a/tools/docker/Dockerfile.test_generic_ssmp b/tools/docker/Dockerfile.test_generic_ssmp index 125ed9bde1..47238cea3a 100644 --- a/tools/docker/Dockerfile.test_generic_ssmp +++ b/tools/docker/Dockerfile.test_generic_ssmp @@ -81,7 +81,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS="" COPY ./tools/docker/scripts/test_regtest.sh ./ RUN /bin/bash -o pipefail -c " \ - TESTOPTS="${TESTOPTS}" \ + TESTOPTS='${TESTOPTS}' \ ./test_regtest.sh 'local' 'ssmp' |& tee report.log && \ rm -rf regtesting" diff --git a/tools/docker/Dockerfile.test_hip_cuda_A100 b/tools/docker/Dockerfile.test_hip_cuda_A100 index d80c9c21a5..734833cc68 100644 --- a/tools/docker/Dockerfile.test_hip_cuda_A100 +++ b/tools/docker/Dockerfile.test_hip_cuda_A100 @@ -179,7 +179,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS="" COPY ./tools/docker/scripts/test_regtest.sh ./ RUN /bin/bash -o pipefail -c " \ - TESTOPTS="${TESTOPTS}" \ + TESTOPTS='${TESTOPTS}' \ ./test_regtest.sh 'local_hip' 'psmp' |& tee report.log && \ rm -rf regtesting" diff --git a/tools/docker/Dockerfile.test_hip_cuda_P100 b/tools/docker/Dockerfile.test_hip_cuda_P100 index 94dcaee034..9ffee10ef6 100644 --- a/tools/docker/Dockerfile.test_hip_cuda_P100 +++ b/tools/docker/Dockerfile.test_hip_cuda_P100 @@ -179,7 +179,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS="" COPY ./tools/docker/scripts/test_regtest.sh ./ RUN /bin/bash -o pipefail -c " \ - TESTOPTS="${TESTOPTS}" \ + TESTOPTS='${TESTOPTS}' \ ./test_regtest.sh 'local_hip' 'psmp' |& tee report.log && \ rm -rf regtesting" diff --git a/tools/docker/Dockerfile.test_hip_cuda_V100 b/tools/docker/Dockerfile.test_hip_cuda_V100 index acc29d65fd..2106b80894 100644 --- a/tools/docker/Dockerfile.test_hip_cuda_V100 +++ b/tools/docker/Dockerfile.test_hip_cuda_V100 @@ -179,7 +179,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS="" COPY ./tools/docker/scripts/test_regtest.sh ./ RUN /bin/bash -o pipefail -c " \ - TESTOPTS="${TESTOPTS}" \ + TESTOPTS='${TESTOPTS}' \ ./test_regtest.sh 'local_hip' 'psmp' |& tee report.log && \ rm -rf regtesting" diff --git a/tools/docker/Dockerfile.test_i386 b/tools/docker/Dockerfile.test_i386 index 160d50b855..838eaedcfa 100644 --- a/tools/docker/Dockerfile.test_i386 +++ b/tools/docker/Dockerfile.test_i386 @@ -109,7 +109,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS="" COPY ./tools/docker/scripts/test_regtest.sh ./ RUN /bin/bash -o pipefail -c " \ - TESTOPTS="${TESTOPTS}" \ + TESTOPTS='${TESTOPTS}' \ ./test_regtest.sh 'local' 'ssmp' |& tee report.log && \ rm -rf regtesting" diff --git a/tools/docker/Dockerfile.test_intel-psmp b/tools/docker/Dockerfile.test_intel-psmp index de8ddf3ed6..e038de77fb 100644 --- a/tools/docker/Dockerfile.test_intel-psmp +++ b/tools/docker/Dockerfile.test_intel-psmp @@ -83,7 +83,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS="" COPY ./tools/docker/scripts/test_regtest.sh ./ RUN /bin/bash -o pipefail -c " \ - TESTOPTS="${TESTOPTS}" \ + TESTOPTS='${TESTOPTS}' \ ./test_regtest.sh 'local' 'psmp' |& tee report.log && \ rm -rf regtesting" diff --git a/tools/docker/Dockerfile.test_minimal b/tools/docker/Dockerfile.test_minimal index 173ce1c59d..790869a6fa 100644 --- a/tools/docker/Dockerfile.test_minimal +++ b/tools/docker/Dockerfile.test_minimal @@ -80,7 +80,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS="" COPY ./tools/docker/scripts/test_regtest.sh ./ RUN /bin/bash -o pipefail -c " \ - TESTOPTS="${TESTOPTS}" \ + TESTOPTS='${TESTOPTS}' \ ./test_regtest.sh 'minimal' 'sdbg' |& tee report.log && \ rm -rf regtesting" diff --git a/tools/docker/Dockerfile.test_openmpi-psmp b/tools/docker/Dockerfile.test_openmpi-psmp index f339ca76b1..95fdb35f9c 100644 --- a/tools/docker/Dockerfile.test_openmpi-psmp +++ b/tools/docker/Dockerfile.test_openmpi-psmp @@ -82,7 +82,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS="" COPY ./tools/docker/scripts/test_regtest.sh ./ RUN /bin/bash -o pipefail -c " \ - TESTOPTS="${TESTOPTS}" \ + TESTOPTS='${TESTOPTS}' \ ./test_regtest.sh 'local' 'psmp' |& tee report.log && \ rm -rf regtesting" diff --git a/tools/docker/Dockerfile.test_pdbg b/tools/docker/Dockerfile.test_pdbg index 69f595d746..9b7a845fc3 100644 --- a/tools/docker/Dockerfile.test_pdbg +++ b/tools/docker/Dockerfile.test_pdbg @@ -81,7 +81,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS="" COPY ./tools/docker/scripts/test_regtest.sh ./ RUN /bin/bash -o pipefail -c " \ - TESTOPTS="${TESTOPTS}" \ + TESTOPTS='${TESTOPTS}' \ ./test_regtest.sh 'local' 'pdbg' |& tee report.log && \ rm -rf regtesting" diff --git a/tools/docker/Dockerfile.test_psmp b/tools/docker/Dockerfile.test_psmp index 1b06a2b996..b8fbde76d4 100644 --- a/tools/docker/Dockerfile.test_psmp +++ b/tools/docker/Dockerfile.test_psmp @@ -81,7 +81,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS="" COPY ./tools/docker/scripts/test_regtest.sh ./ RUN /bin/bash -o pipefail -c " \ - TESTOPTS="${TESTOPTS}" \ + TESTOPTS='${TESTOPTS}' \ ./test_regtest.sh 'local' 'psmp' |& tee report.log && \ rm -rf regtesting" diff --git a/tools/docker/Dockerfile.test_sdbg b/tools/docker/Dockerfile.test_sdbg index 9903548abd..996f07c069 100644 --- a/tools/docker/Dockerfile.test_sdbg +++ b/tools/docker/Dockerfile.test_sdbg @@ -80,7 +80,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS="" COPY ./tools/docker/scripts/test_regtest.sh ./ RUN /bin/bash -o pipefail -c " \ - TESTOPTS="${TESTOPTS}" \ + TESTOPTS='${TESTOPTS}' \ ./test_regtest.sh 'local' 'sdbg' |& tee report.log && \ rm -rf regtesting" diff --git a/tools/docker/Dockerfile.test_ssmp b/tools/docker/Dockerfile.test_ssmp index e911b237ff..bd043ca768 100644 --- a/tools/docker/Dockerfile.test_ssmp +++ b/tools/docker/Dockerfile.test_ssmp @@ -80,7 +80,7 @@ COPY ./tools/regtesting ./tools/regtesting ARG TESTOPTS="" COPY ./tools/docker/scripts/test_regtest.sh ./ RUN /bin/bash -o pipefail -c " \ - TESTOPTS="${TESTOPTS}" \ + TESTOPTS='${TESTOPTS}' \ ./test_regtest.sh 'local' 'ssmp' |& tee report.log && \ rm -rf regtesting" diff --git a/tools/docker/generate_dockerfiles.py b/tools/docker/generate_dockerfiles.py index 5e5a9e292c..b9276eff98 100755 --- a/tools/docker/generate_dockerfiles.py +++ b/tools/docker/generate_dockerfiles.py @@ -136,7 +136,7 @@ def regtest( ARG TESTOPTS="{testopts}" COPY ./tools/docker/scripts/test_regtest.sh ./ RUN /bin/bash -o pipefail -c " \ - TESTOPTS="${{TESTOPTS}}" \ + TESTOPTS='${{TESTOPTS}}' \ ./test_regtest.sh '{arch}' '{version}' |& tee report.log && \ rm -rf regtesting" """ @@ -326,7 +326,7 @@ def production(version: str, arch: str = "local", intel: bool = False) -> str: ARG TESTOPTS RUN /bin/bash -c " \ source /opt/cp2k-toolchain/install/setup && \ - ./tools/regtesting/do_regtest.py '{arch}' '{version}' --skipdir=UNIT/libcp2k_unittest "${{TESTOPTS}}" |& tee regtests.log && \ + ./tools/regtesting/do_regtest.py '{arch}' '{version}' --skipdir=UNIT/libcp2k_unittest '${{TESTOPTS}}' |& tee regtests.log && \ rm -rf regtesting" # Setup entry point for production.