From 04a2fd6c08b94b6bd8f41e70161d78ca64ba6720 Mon Sep 17 00:00:00 2001
From: Ansgar Burchardt <Ansgar.Burchardt@tu-dresden.de>
Date: Tue, 28 Nov 2017 17:23:47 +0100
Subject: [PATCH] opts: set `-DDUNE_MAX_TEST_CORES=${DUNECI_PARALLEL}`

But only if `${DUNECI_PARALLEL}` is set.

Reference: https://gitlab.dune-project.org/infrastructure/issues0/issues/47
---
 base-10/opts.clang          | 2 +-
 base-10/opts.gcc            | 2 +-
 base-10/opts.gcc.c++17      | 2 +-
 base-16.04/opts.clang       | 2 +-
 base-16.04/opts.gcc         | 2 +-
 base-16.10/opts.clang       | 2 +-
 base-16.10/opts.gcc         | 2 +-
 base-8-backports/opts.clang | 2 +-
 base-8/opts.clang           | 2 +-
 base-8/opts.gcc             | 2 +-
 base-9/opts.clang           | 2 +-
 base-9/opts.gcc             | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/base-10/opts.clang b/base-10/opts.clang
index 748ab4b..faaba7d 100644
--- a/base-10/opts.clang
+++ b/base-10/opts.clang
@@ -1 +1 @@
-CMAKE_FLAGS="-DCMAKE_CXX_COMPILER=/usr/bin/clang++-4.0 -DCMAKE_C_COMPILER=/usr/bin/clang-4.0 -DCXX_MAX_STANDARD=17 -DCMAKE_CXX_FLAGS='-O2 -g -Wall -fcolor-diagnostics -ftemplate-backtrace-limit=0'"
+CMAKE_FLAGS="-DCMAKE_CXX_COMPILER=/usr/bin/clang++-4.0 -DCMAKE_C_COMPILER=/usr/bin/clang-4.0 -DCXX_MAX_STANDARD=17 -DCMAKE_CXX_FLAGS='-O2 -g -Wall -fcolor-diagnostics -ftemplate-backtrace-limit=0' ${DUNECI_PARALLEL:+-DDUNE_MAX_TEST_CORES=${DUNECI_PARALLEL}}"
diff --git a/base-10/opts.gcc b/base-10/opts.gcc
index 466c3b9..0fc48e1 100644
--- a/base-10/opts.gcc
+++ b/base-10/opts.gcc
@@ -1 +1 @@
-CMAKE_FLAGS="-DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_FLAGS='-O2 -g -Wall -fdiagnostics-color=always'"
+CMAKE_FLAGS="-DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_FLAGS='-O2 -g -Wall -fdiagnostics-color=always' ${DUNECI_PARALLEL:+-DDUNE_MAX_TEST_CORES=${DUNECI_PARALLEL}}"
diff --git a/base-10/opts.gcc.c++17 b/base-10/opts.gcc.c++17
index ab8d1dc..188c721 100644
--- a/base-10/opts.gcc.c++17
+++ b/base-10/opts.gcc.c++17
@@ -1 +1 @@
-CMAKE_FLAGS="-DCMAKE_CXX_COMPILER=/usr/bin/g++-7 -DCMAKE_C_COMPILER=/usr/bin/gcc-7 -DCXX_MAX_STANDARD=17 -DCMAKE_CXX_FLAGS='-O2 -g -Wall -fdiagnostics-color=always'"
+CMAKE_FLAGS="-DCMAKE_CXX_COMPILER=/usr/bin/g++-7 -DCMAKE_C_COMPILER=/usr/bin/gcc-7 -DCXX_MAX_STANDARD=17 -DCMAKE_CXX_FLAGS='-O2 -g -Wall -fdiagnostics-color=always' ${DUNECI_PARALLEL:+-DDUNE_MAX_TEST_CORES=${DUNECI_PARALLEL}}"
diff --git a/base-16.04/opts.clang b/base-16.04/opts.clang
index 3746e5f..8022ec1 100644
--- a/base-16.04/opts.clang
+++ b/base-16.04/opts.clang
@@ -1 +1 @@
-CMAKE_FLAGS="-DCMAKE_CXX_COMPILER='/usr/bin/clang++' -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_FLAGS='-O2 -g -Wall -fcolor-diagnostics -ftemplate-backtrace-limit=0'"
+CMAKE_FLAGS="-DCMAKE_CXX_COMPILER='/usr/bin/clang++' -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_FLAGS='-O2 -g -Wall -fcolor-diagnostics -ftemplate-backtrace-limit=0' ${DUNECI_PARALLEL:+-DDUNE_MAX_TEST_CORES=${DUNECI_PARALLEL}}"
diff --git a/base-16.04/opts.gcc b/base-16.04/opts.gcc
index c8c7561..7821ee3 100644
--- a/base-16.04/opts.gcc
+++ b/base-16.04/opts.gcc
@@ -1 +1 @@
-CMAKE_FLAGS="-DCMAKE_CXX_FLAGS='-O2 -g -Wall -fdiagnostics-color=always'"
+CMAKE_FLAGS="-DCMAKE_CXX_FLAGS='-O2 -g -Wall -fdiagnostics-color=always' ${DUNECI_PARALLEL:+-DDUNE_MAX_TEST_CORES=${DUNECI_PARALLEL}}"
diff --git a/base-16.10/opts.clang b/base-16.10/opts.clang
index 3746e5f..8022ec1 100644
--- a/base-16.10/opts.clang
+++ b/base-16.10/opts.clang
@@ -1 +1 @@
-CMAKE_FLAGS="-DCMAKE_CXX_COMPILER='/usr/bin/clang++' -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_FLAGS='-O2 -g -Wall -fcolor-diagnostics -ftemplate-backtrace-limit=0'"
+CMAKE_FLAGS="-DCMAKE_CXX_COMPILER='/usr/bin/clang++' -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_FLAGS='-O2 -g -Wall -fcolor-diagnostics -ftemplate-backtrace-limit=0' ${DUNECI_PARALLEL:+-DDUNE_MAX_TEST_CORES=${DUNECI_PARALLEL}}"
diff --git a/base-16.10/opts.gcc b/base-16.10/opts.gcc
index c8c7561..7821ee3 100644
--- a/base-16.10/opts.gcc
+++ b/base-16.10/opts.gcc
@@ -1 +1 @@
-CMAKE_FLAGS="-DCMAKE_CXX_FLAGS='-O2 -g -Wall -fdiagnostics-color=always'"
+CMAKE_FLAGS="-DCMAKE_CXX_FLAGS='-O2 -g -Wall -fdiagnostics-color=always' ${DUNECI_PARALLEL:+-DDUNE_MAX_TEST_CORES=${DUNECI_PARALLEL}}"
diff --git a/base-8-backports/opts.clang b/base-8-backports/opts.clang
index e085c19..00b7e83 100644
--- a/base-8-backports/opts.clang
+++ b/base-8-backports/opts.clang
@@ -1 +1 @@
-CMAKE_FLAGS="-DCMAKE_CXX_COMPILER='/usr/bin/clang++-3.8' -DCMAKE_C_COMPILER=/usr/bin/clang-3.8 -DCMAKE_CXX_FLAGS='-O2 -g -Wall -fcolor-diagnostics -ftemplate-backtrace-limit=0'"
+CMAKE_FLAGS="-DCMAKE_CXX_COMPILER='/usr/bin/clang++-3.8' -DCMAKE_C_COMPILER=/usr/bin/clang-3.8 -DCMAKE_CXX_FLAGS='-O2 -g -Wall -fcolor-diagnostics -ftemplate-backtrace-limit=0' ${DUNECI_PARALLEL:+-DDUNE_MAX_TEST_CORES=${DUNECI_PARALLEL}}"
diff --git a/base-8/opts.clang b/base-8/opts.clang
index d38c606..30a2c70 100644
--- a/base-8/opts.clang
+++ b/base-8/opts.clang
@@ -1 +1 @@
-CMAKE_FLAGS="-DCMAKE_CXX_COMPILER='/usr/bin/clang++' -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_FLAGS='-O2 -Wall -ftemplate-backtrace-limit=0'"
+CMAKE_FLAGS="-DCMAKE_CXX_COMPILER='/usr/bin/clang++' -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_FLAGS='-O2 -Wall -ftemplate-backtrace-limit=0' ${DUNECI_PARALLEL:+-DDUNE_MAX_TEST_CORES=${DUNECI_PARALLEL}}"
diff --git a/base-8/opts.gcc b/base-8/opts.gcc
index 90868a5..2e5fea6 100644
--- a/base-8/opts.gcc
+++ b/base-8/opts.gcc
@@ -1 +1 @@
-CMAKE_FLAGS="-DCMAKE_CXX_FLAGS='-O2 -g -Wall'"
+CMAKE_FLAGS="-DCMAKE_CXX_FLAGS='-O2 -g -Wall' ${DUNECI_PARALLEL:+-DDUNE_MAX_TEST_CORES=${DUNECI_PARALLEL}}"
diff --git a/base-9/opts.clang b/base-9/opts.clang
index 3746e5f..8022ec1 100644
--- a/base-9/opts.clang
+++ b/base-9/opts.clang
@@ -1 +1 @@
-CMAKE_FLAGS="-DCMAKE_CXX_COMPILER='/usr/bin/clang++' -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_FLAGS='-O2 -g -Wall -fcolor-diagnostics -ftemplate-backtrace-limit=0'"
+CMAKE_FLAGS="-DCMAKE_CXX_COMPILER='/usr/bin/clang++' -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_FLAGS='-O2 -g -Wall -fcolor-diagnostics -ftemplate-backtrace-limit=0' ${DUNECI_PARALLEL:+-DDUNE_MAX_TEST_CORES=${DUNECI_PARALLEL}}"
diff --git a/base-9/opts.gcc b/base-9/opts.gcc
index c8c7561..7821ee3 100644
--- a/base-9/opts.gcc
+++ b/base-9/opts.gcc
@@ -1 +1 @@
-CMAKE_FLAGS="-DCMAKE_CXX_FLAGS='-O2 -g -Wall -fdiagnostics-color=always'"
+CMAKE_FLAGS="-DCMAKE_CXX_FLAGS='-O2 -g -Wall -fdiagnostics-color=always' ${DUNECI_PARALLEL:+-DDUNE_MAX_TEST_CORES=${DUNECI_PARALLEL}}"
-- 
GitLab