From 22143ea02418adb7f6a043b5ecd3b56ca04a41f1 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 5 Oct 2020 19:06:19 +0200 Subject: [PATCH] new tests --- .gitlab-ci.yml | 12 +++++++++++- PRIVATE | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4e83757e5..722811446 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -193,6 +193,8 @@ grid_mech_compile_Intel: - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel - cp -r grid_mech_compile grid_mech_compile_Intel - grid_mech_compile_Intel/test.py + - cd pytest + - pytest -k 'compile and grid' except: - master - release @@ -203,6 +205,8 @@ Compile_FEM_Intel: - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel - cp -r FEM_compile FEM_compile_Intel - FEM_compile_Intel/test.py + - cd pytest + - pytest -k 'compile and mesh' except: - master - release @@ -213,6 +217,8 @@ grid_mech_compile_GNU: - module load $GNUCompiler $MPICH_GNU $PETSc_MPICH_GNU - cp -r grid_mech_compile grid_mech_compile_GNU - grid_mech_compile_GNU/test.py + - cd pytest + - pytest -k 'compile and grid' except: - master - release @@ -223,6 +229,8 @@ Compile_FEM_GNU: - module load $GNUCompiler $MPICH_GNU $PETSc_MPICH_GNU - cp -r FEM_compile FEM_compile_GNU - FEM_compile_GNU/test.py + - cd pytest + - pytest -k 'compile and mesh' except: - master - release @@ -244,7 +252,7 @@ Pytest_grid: script: - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel - cd pytest - - pytest + - pytest -m 'not compile' except: - master - release @@ -320,6 +328,8 @@ Marc_compileIfort: script: - module load $IntelMarc $HDF5Marc $MSC - Marc_compileIfort/test.py + - cd pytest + - pytest -k 'compile and Marc' except: - master - release diff --git a/PRIVATE b/PRIVATE index 64e62f805..fc9172ede 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 64e62f805b5ad784e3397ee5f735aaeb3cc134c2 +Subproject commit fc9172ede32ba5609d494a03c1d11bcd60d48cb8