From 302e78aff8f88b5357cf87b893cf3641ac0bbdb1 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 26 Feb 2020 13:19:01 +0100 Subject: [PATCH] test damage results use pytest/HDF5 instead of test class and ASCII table --- .gitlab-ci.yml | 11 ++++++++++- PRIVATE | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ce645dcf5..a56b108d5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -104,7 +104,7 @@ checkout: - release ################################################################################################### -Pytest: +Pytest_python: stage: python script: - cd $DAMASKROOT/python @@ -385,6 +385,15 @@ Phenopowerlaw_singleSlip: - master - release +Pytest_grid: + stage: grid + script: + - cd pytest + - pytest + except: + - master + - release + ################################################################################################### Marc_compileIfort: stage: compileMarc diff --git a/PRIVATE b/PRIVATE index 6db5f4666..9573ce7bd 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 6db5f4666fc651b4de3b44ceaed3f2b848170ac9 +Subproject commit 9573ce7bd2c1a7188c1aac5b83aa76d480c2bdb0