From 9d9515ab4d0bd7b6edf6c5c428b5e017c62e4653 Mon Sep 17 00:00:00 2001
From: Dennis <dennis.glaeser@iws.uni-stuttgart.de>
Date: Wed, 12 May 2021 12:27:14 +0200
Subject: [PATCH 1/4] [cmake] use correct target for skipped tests

---
 cmake/modules/DumuxTestMacros.cmake | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cmake/modules/DumuxTestMacros.cmake b/cmake/modules/DumuxTestMacros.cmake
index 5268191a60..50b9306103 100644
--- a/cmake/modules/DumuxTestMacros.cmake
+++ b/cmake/modules/DumuxTestMacros.cmake
@@ -249,10 +249,11 @@ function(dumux_add_test)
     set(dummymain ${CMAKE_CURRENT_BINARY_DIR}/main77_${ADDTEST_NAME}.cc)
     configure_file(${scriptdir}/main77.cc.in ${dummymain})
     set(ADDTEST_SOURCES ${dummymain})
-  endif()
 
-  # Add the executable if it is not already present
-  if(ADDTEST_SOURCES)
+    # Tests to be skipped get a dummy target based on the name
+    set(ADDTEST_TARGET ${ADDTEST_NAME})
+  elseif(ADDTEST_SOURCES)
+    # Add the executable if it is not already present
     set(ADDTEST_TARGET ${ADDTEST_NAME})
   endif()
 
-- 
GitLab


From 7d34f34c90d5c4ed58be88d9e7dfb8ef54299d1b Mon Sep 17 00:00:00 2001
From: Dennis <dennis.glaeser@iws.uni-stuttgart.de>
Date: Wed, 12 May 2021 13:45:39 +0200
Subject: [PATCH 2/4] FAKE CHANGE

---
 test/porousmediumflow/1p/convergence/discretesolution/problem.hh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/porousmediumflow/1p/convergence/discretesolution/problem.hh b/test/porousmediumflow/1p/convergence/discretesolution/problem.hh
index e7aeda7baa..6ad6f7dc07 100644
--- a/test/porousmediumflow/1p/convergence/discretesolution/problem.hh
+++ b/test/porousmediumflow/1p/convergence/discretesolution/problem.hh
@@ -25,7 +25,6 @@
 #define DUMUX_INCOMPRESSIBLE_ONEP_CONVERGENCETEST_PROBLEM_HH
 
 #include <cmath>
-
 #include <dune/geometry/quadraturerules.hh>
 
 #include <dumux/common/properties.hh>
-- 
GitLab


From 3f4657962fa1685f7732bf282bf4588f8811ba5f Mon Sep 17 00:00:00 2001
From: Dennis <dennis.glaeser@iws.uni-stuttgart.de>
Date: Tue, 18 May 2021 10:22:10 +0200
Subject: [PATCH 3/4] [TEMP] add debug output

---
 bin/testing/findtests.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/testing/findtests.py b/bin/testing/findtests.py
index f92322c665..365d1f73e1 100755
--- a/bin/testing/findtests.py
+++ b/bin/testing/findtests.py
@@ -72,6 +72,7 @@ def isAffectedTest(testConfigFile, changed_files):
     test_files = set(test_files)
 
     if hasCommonMember(changed_files, test_files):
+        print("Main-File of test {}: {}".format(testConfigFile, mainFile))
         return True, testConfig["name"], testConfig["target"]
 
     return False, testConfig["name"], testConfig["target"]
-- 
GitLab


From 15a1db051fe558b29caba1e1fdc9f8df22a242d4 Mon Sep 17 00:00:00 2001
From: Dennis <dennis.glaeser@iws.uni-stuttgart.de>
Date: Tue, 18 May 2021 12:44:32 +0200
Subject: [PATCH 4/4] [TEMP] remove preexisting build

---
 .gitlab-ci/default.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci/default.yml b/.gitlab-ci/default.yml
index 06a1a2262a..96cd49f03e 100644
--- a/.gitlab-ci/default.yml
+++ b/.gitlab-ci/default.yml
@@ -19,6 +19,7 @@ select tests:
   script:
     - |
       if [[ "$TRIGGER_SOURCE" == "merge_request_event" ]]; then
+          rm -rf build-cmake/
           dunecontrol --opts=$DUNE_OPTS_FILE --current all
           pushd build-cmake
             python3 ../bin/testing/findtests.py -f ../affectedtests.json -t origin/master
-- 
GitLab