Skip to content
Snippets Groups Projects
Commit fc4d8ec5 authored by Jorrit Fahlke's avatar Jorrit Fahlke
Browse files

[CI] Use the standard test again.

`duneci-statndard-test` gained the ability to run the tests with
-j$DUNECI_PARALLEL, which was the last thing that duneci-perftool-small-test
did specially.  So use that.
parent fce41cac
No related branches found
No related tags found
No related merge requests found
......@@ -13,18 +13,19 @@ before_script:
# make sure we can apply the patches
- git submodule foreach --recursive git reset --hard HEAD
- patches/apply_patches.sh
# detect number of processors, but make sure never to run with -j"", as the
# build host would likely run out of memory
- : ${DUNECI_PARALLEL:=$(nproc || echo 1)}
- export DUNECI_PARALLEL
git--gcc:
image: registry.dune-project.org/joe/dune-perftool-ci/perftool-base:git
script:
- bin/duneci-perftool-small-test
script: duneci-standard-test
git--clang:
image: registry.dune-project.org/joe/dune-perftool-ci/perftool-base:git
script:
- bin/duneci-perftool-small-test --opts=/duneci/opts.clang
script: duneci-standard-test --opts=/duneci/opts.clang
git--pacxx:
image: registry.dune-project.org/joe/dune-perftool-ci/pacxx-perftool-base:git
script:
- bin/duneci-perftool-small-test --opts=/duneci/opts.pacxx
script: duneci-standard-test --opts=/duneci/opts.pacxx
#! /bin/bash
set -e
set -u
: ${DUNECI_OPTS:=/duneci/opts.gcc}
set -- --opts="${DUNECI_OPTS}" "${@}"
DUNECONTROL=dunecontrol
if [[ -x bin/dunecontrol ]]; then
DUNECONTROL=bin/dunecontrol
fi
DUNE_CTEST=duneci-ctest
if [[ -x bin/dune-ctest ]]; then
DUNE_CTEST=../bin/dune-ctest
fi
set -x
${DUNECONTROL} --current "${@}" configure
${DUNECONTROL} --current "${@}" make -j$(nproc)
${DUNECONTROL} --current "${@}" make -j$(nproc) ${DUNECI_BUILD_TESTS:-build_tests}
${DUNECONTROL} --current "${@}" bexec ${DUNE_CTEST} -j$(nproc) ${DUNECI_RUN_TESTS:-}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment