Docker: Fix quoting of TESTOPTS

This commit is contained in:
Ole Schütt 2023-08-30 19:22:33 +02:00 committed by Ole Schütt
parent 130ab16a8f
commit 2e356e7d9b
40 changed files with 41 additions and 41 deletions

View file

@ -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.

View file

@ -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.

View file

@ -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.

View file

@ -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.

View file

@ -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.

View file

@ -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.

View file

@ -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.

View file

@ -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.

View file

@ -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.

View file

@ -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.

View file

@ -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.

View file

@ -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.

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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.