From d7c6628eaa29b34d39a03c578230ce1af562c2fd Mon Sep 17 00:00:00 2001
From: Johannes Feldmann <feldmann@eit.uni-kl.de>
Date: Tue, 18 Dec 2018 10:21:12 +0100
Subject: [PATCH] Moved creation of directory coverage to jobs

---
 .gitlab-ci.yml              | 3 +--
 DRAMSys/tests/DDR3/ci.yml   | 3 +++
 DRAMSys/tests/WIDEIO/ci.yml | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7714db08..cdbd9165 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,11 +23,10 @@ build:
         - cd build
         - qmake ../DRAMSys/DRAMSys.pro
         - make -j4
-        - mkdir -p ${CI_PROJECT_DIR}/coverage
  
 coverage:
     stage: Coverage
-    coverage: '/^TOTAL.*\s+(\d+\%)$/'
+    coverage: '/^\s*lines\s*\d+.\d+\%/'
     script:
         - lcov `find coverage -type f -exec echo "-a {}" \;` -o coverage/final.out
     artifacts:
diff --git a/DRAMSys/tests/DDR3/ci.yml b/DRAMSys/tests/DDR3/ci.yml
index a0270dc4..1ed5cf78 100644
--- a/DRAMSys/tests/DDR3/ci.yml
+++ b/DRAMSys/tests/DDR3/ci.yml
@@ -11,6 +11,7 @@ example_ddr3:
         - cd ../traceAnalyzer
         - python3 ../../DRAMSys/traceAnalyzer/scripts/tests.py ../simulator/ddr3-example_ddr3_ch0.tdb | if ! grep "failed"; then exit 0; else exit 1; fi
         # Run Code Coverage
+        - mkdir -p ${CI_PROJECT_DIR}/coverage
         - lcov -c -d ${CI_PROJECT_DIR}/build/ -o ${CI_PROJECT_DIR}/coverage/${CI_JOB_NAME}.out
     artifacts:
         paths:
@@ -31,6 +32,7 @@ fr_fcfs:
         - cd ../traceAnalyzer
         - python3 ../../DRAMSys/traceAnalyzer/scripts/tests.py ../simulator/ddr3-fr_fcfs_ddr3_ch0.tdb | if ! grep "failed"; then exit 0; else exit 1; fi
         # Run Code Coverage
+        - mkdir -p ${CI_PROJECT_DIR}/coverage
         - lcov -c -d ${CI_PROJECT_DIR}/build/ -o ${CI_PROJECT_DIR}/coverage/${CI_JOB_NAME}.out
 
     allow_failure: true # TODO should be removed after first tests
@@ -49,6 +51,7 @@ protocol_checker:
         - ./DRAMSys ../../DRAMSys/tests/DDR3/simulations/ddr3-protocol_checker.xml ../../DRAMSys/tests/DDR3/
         - echo "TODO"
         # Run Code Coverage
+        - mkdir -p ${CI_PROJECT_DIR}/coverage
         - lcov -c -d ${CI_PROJECT_DIR}/build/ -o ${CI_PROJECT_DIR}/coverage/${CI_JOB_NAME}.out
 
     artifacts:
diff --git a/DRAMSys/tests/WIDEIO/ci.yml b/DRAMSys/tests/WIDEIO/ci.yml
index 834eceb8..02b5482e 100644
--- a/DRAMSys/tests/WIDEIO/ci.yml
+++ b/DRAMSys/tests/WIDEIO/ci.yml
@@ -16,6 +16,7 @@ example_wideio:
         - python3 ../../DRAMSys/traceAnalyzer/scripts/tests.py ../simulator/wideio-example_wideio_ch2.tdb | if ! grep "failed"; then exit 0; else exit 1; fi
         - python3 ../../DRAMSys/traceAnalyzer/scripts/tests.py ../simulator/wideio-example_wideio_ch3.tdb | if ! grep "failed"; then exit 0; else exit 1; fi
         # Run Code Coverage
+        - mkdir -p ${CI_PROJECT_DIR}/coverage
         - lcov -c -d ${CI_PROJECT_DIR}/build/ -o ${CI_PROJECT_DIR}/coverage/${CI_JOB_NAME}.out
         
     allow_failure: true # TODO: should be removed once the problems are fixed!