From fc4d8ec5ba87965f47e92ec0bf53aef23481d121 Mon Sep 17 00:00:00 2001
From: Jorrit Fahlke <jorrit@jorrit.de>
Date: Fri, 25 Aug 2017 09:41:40 +0200
Subject: [PATCH] [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.
---
.gitlab-ci.yml | 13 +++++++------
bin/duneci-perftool-small-test | 23 -----------------------
2 files changed, 7 insertions(+), 29 deletions(-)
delete mode 100755 bin/duneci-perftool-small-test
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ace6aca7..043961cb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
diff --git a/bin/duneci-perftool-small-test b/bin/duneci-perftool-small-test
deleted file mode 100755
index 4a78acbf..00000000
--- a/bin/duneci-perftool-small-test
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /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:-}
--
GitLab