Skip to content

Commit ab6f33c

Browse files
committed
simplified
TEMPDIR was leftover from bare-metal testing
1 parent 1b55d11 commit ab6f33c

File tree

1 file changed

+15
-22
lines changed

1 file changed

+15
-22
lines changed

.gitlab-ci.yml

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ mypy:
138138
- matesting2-container-runner
139139
script:
140140
- source env/DAMASK.sh
141-
- cd ${TEMPDIR}
142141
- ./bin/DAMASK_test
143142
- find . -name '*.gcda' -not -path "**/test/*" -exec gcov {} \;
144143

@@ -148,25 +147,22 @@ unittest_GCC_DEBUG:
148147
extends: .unittest
149148
image: git.damask-multiphysics.org:5050/damask/damask/gcc_petsc-debug:2025.03.10
150149
before_script:
151-
- TEMPDIR=$(mktemp -d /tmp/tmp.XXXXXXXXXX)
152-
- cmake -B ${TEMPDIR} -DDAMASK_SOLVER=test -DCMAKE_INSTALL_PREFIX=${TEMPDIR} -DCMAKE_BUILD_TYPE=DEBUG -DBUILDCMD_POST=-coverage
153-
- cmake --build ${TEMPDIR} --target install
150+
- cmake -B builddir -DDAMASK_SOLVER=test -DCMAKE_INSTALL_PREFIX=${PWD} -DCMAKE_BUILD_TYPE=DEBUG -DBUILDCMD_POST=-coverage
151+
- cmake --build builddir --target install
154152

155153
unittest_GCC_RELEASE:
156154
extends: .unittest
157155
image: git.damask-multiphysics.org:5050/damask/damask/gcc_petsc-default:2025.03.10
158156
before_script:
159-
- TEMPDIR=$(mktemp -d /tmp/tmp.XXXXXXXXXX)
160-
- cmake -B ${TEMPDIR} -DDAMASK_SOLVER=test -DCMAKE_INSTALL_PREFIX=${TEMPDIR} -DCMAKE_BUILD_TYPE=RELEASE -DBUILDCMD_POST=-coverage
161-
- cmake --build ${TEMPDIR} --target install
157+
- cmake -B builddir -DDAMASK_SOLVER=test -DCMAKE_INSTALL_PREFIX=${PWD} -DCMAKE_BUILD_TYPE=RELEASE -DBUILDCMD_POST=-coverage
158+
- cmake --build builddir --target install
162159

163160
unittest_GCC_PERFORMANCE:
164161
extends: .unittest
165162
image: git.damask-multiphysics.org:5050/damask/damask/gcc_petsc-default:2025.03.10
166163
before_script:
167-
- TEMPDIR=$(mktemp -d /tmp/tmp.XXXXXXXXXX)
168-
- cmake -B ${TEMPDIR} -DDAMASK_SOLVER=test -DCMAKE_INSTALL_PREFIX=${TEMPDIR} -DCMAKE_BUILD_TYPE=PERFORMANCE -DBUILDCMD_POST=-coverage
169-
- cmake --build ${TEMPDIR} --target install
164+
- cmake -B builddir -DDAMASK_SOLVER=test -DCMAKE_INSTALL_PREFIX=${PWD} -DCMAKE_BUILD_TYPE=PERFORMANCE -DBUILDCMD_POST=-coverage
165+
- cmake --build builddir --target install
170166

171167
# -------------------------------------------------------------------------------------------------
172168

@@ -177,25 +173,22 @@ unittest_oneAPI_DEBUG:
177173
# https://community.intel.com/t5/Intel-oneAPI-Math-Kernel-Library/Floating-point-exception-in-dgeev/td-p/1665868
178174
- sed -i '/set (DEBUG_FLAGS "${DEBUG_FLAGS} -fpe-all=0/d' cmake/Compiler-IntelLLVM.cmake
179175
- sed -i 's/FP_TRAP_ON/FP_TRAP_OFF/g' src/parallelization.f90
180-
- TEMPDIR=$(mktemp -d /tmp/tmp.XXXXXXXXXX)
181-
- cmake -B ${TEMPDIR} -DDAMASK_SOLVER=test -DCMAKE_INSTALL_PREFIX=${TEMPDIR} -DCMAKE_BUILD_TYPE=DEBUG
182-
- cmake --build ${TEMPDIR} --target install
176+
- cmake -B builddir -DDAMASK_SOLVER=test -DCMAKE_INSTALL_PREFIX=${PWD} -DCMAKE_BUILD_TYPE=DEBUG
177+
- cmake --build builddir --target install
183178

184179
unittest_oneAPI_RELEASE:
185180
extends: .unittest
186181
image: git.damask-multiphysics.org:5050/damask/damask/oneapi_petsc-default:2025.03.09
187182
before_script:
188-
- TEMPDIR=$(mktemp -d /tmp/tmp.XXXXXXXXXX)
189-
- cmake -B ${TEMPDIR} -DDAMASK_SOLVER=test -DCMAKE_INSTALL_PREFIX=${TEMPDIR} -DCMAKE_BUILD_TYPE=RELEASE
190-
- cmake --build ${TEMPDIR} --target install
183+
- cmake -B builddir -DDAMASK_SOLVER=test -DCMAKE_INSTALL_PREFIX=${PWD} -DCMAKE_BUILD_TYPE=RELEASE
184+
- cmake --build builddir --target install
191185

192186
unittest_oneAPI_PERFORMANCE:
193187
extends: .unittest
194188
image: git.damask-multiphysics.org:5050/damask/damask/oneapi_petsc-default:2025.03.09
195189
before_script:
196-
- TEMPDIR=$(mktemp -d /tmp/tmp.XXXXXXXXXX)
197-
- cmake -B ${TEMPDIR} -DDAMASK_SOLVER=test -DCMAKE_INSTALL_PREFIX=${TEMPDIR} -DCMAKE_BUILD_TYPE=PERFORMANCE
198-
- cmake --build ${TEMPDIR} --target install
190+
- cmake -B builddir -DDAMASK_SOLVER=test -DCMAKE_INSTALL_PREFIX=${PWD} -DCMAKE_BUILD_TYPE=PERFORMANCE
191+
- cmake --build builddir --target install
199192

200193
###################################################################################################
201194

@@ -285,7 +278,7 @@ open-source_grid_GCC:
285278
- source env/DAMASK.sh
286279
script:
287280
- cd PRIVATE/testing
288-
- pytest -k 'not compile and grid and not signal and not restart'
281+
- pytest -k 'grid and not compile and not (signal or restart)'
289282

290283
open-source_grid_signal_restart:
291284
stage: fortran
@@ -302,7 +295,7 @@ open-source_grid_signal_restart:
302295
- echo Job start:" $(date)"
303296
script:
304297
- cd PRIVATE/testing
305-
- pytest -k 'not compile and grid and (signal or restart)' -m 'not cifail' --basetemp ${TESTROOT}/open-source -v
298+
- pytest -k 'grid and not compile and (signal or restart)' -m 'not cifail' --basetemp ${TESTROOT}/open-source -v
306299
after_script:
307300
- echo Job end:" $(date)"
308301

@@ -316,7 +309,7 @@ open-source_mesh_GCC:
316309
- source env/DAMASK.sh
317310
script:
318311
- cd PRIVATE/testing
319-
- pytest -k 'not compile and mesh'
312+
- pytest -k 'mesh and not compile'
320313

321314
Marc:
322315
stage: fortran

0 commit comments

Comments
 (0)