Skip to content

Commit

Permalink
Toolchain: fix valgrind arch filenames
Browse files Browse the repository at this point in the history
  • Loading branch information
oschuett committed Jan 8, 2019
1 parent ce328c2 commit 54d964c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ COPY ./scripts/install_basics.sh .
RUN ./install_basics.sh

COPY ./scripts/install_regtest.sh .
RUN ./install_regtest.sh local_valgrind pdbg
RUN ./install_regtest.sh local_valgrind popt

COPY ./scripts/ci_entrypoint.sh ./scripts/test_regtest.sh ./
CMD ["./ci_entrypoint.sh", "./test_regtest.sh", "local_valgrind", "pdbg"]
CMD ["./ci_entrypoint.sh", "./test_regtest.sh", "local_valgrind", "popt"]

#EOF
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ COPY ./scripts/install_basics.sh .
RUN ./install_basics.sh

COPY ./scripts/install_regtest.sh .
RUN ./install_regtest.sh local_valgrind sdbg
RUN ./install_regtest.sh local_valgrind sopt

COPY ./scripts/ci_entrypoint.sh ./scripts/test_regtest.sh ./
CMD ["./ci_entrypoint.sh", "./test_regtest.sh", "local_valgrind", "sdbg"]
CMD ["./ci_entrypoint.sh", "./test_regtest.sh", "local_valgrind", "sopt"]

#EOF
4 changes: 2 additions & 2 deletions tools/toolchain/install_cp2k_toolchain.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1214,9 +1214,9 @@ if [ "$ENABLE_CUDA" = __TRUE__ ] ; then
fi
# valgrind enabled arch files
if [ "$ENABLE_VALGRIND" = __TRUE__ ] ; then
gen_arch_file "local_valgrind.sdbg" VALGRIND
gen_arch_file "local_valgrind.sopt" VALGRIND
[ "$MPI_MODE" != no ] && \
gen_arch_file "local_valgrind.pdbg" VALGRIND MPI
gen_arch_file "local_valgrind.popt" VALGRIND MPI
fi
# coverage enabled arch files
if [ "$ENABLE_COVERAGE" = __TRUE__ ]; then
Expand Down

0 comments on commit 54d964c

Please sign in to comment.