ElektraInitiative#3713 fixed test exclusion mechanism

tucek · Mar 31, 2021 · 1a4988c · 1a4988c
1 parent d003221
commit 1a4988c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 16 deletions.
diff --git a/src/bindings/jna/CMakeLists.txt b/src/bindings/jna/CMakeLists.txt
@@ -5,7 +5,7 @@ set (MIN_JAVA_VERSION "1.8.0")
 set (MIN_GRADLE_VERSION "6.8.0")
 
 macro (java_exclude_test test)
-	string (APPEND GRADLE_TEST_EXCLUDES "\texclude '**/${test}.class'\n")
+	string (APPEND GRADLE_TEST_EXCLUDES "\t\texcludeTestsMatching '*.${test}'\n")
 endmacro ()
 
 macro (java_test_needs_plugin test plugin)

diff --git a/src/bindings/jna/java-shared.gradle b/src/bindings/jna/java-shared.gradle
@@ -90,6 +90,13 @@ tasks.named('test').configure {
 	}
 }
 
+// apply optional test override
+File testExclusions = new File(project.projectDir, 'test-exclusion.gradle')
+if (testExclusions.exists()) {
+	apply from: testExclusions
+	logger.lifecycle("Test exclusions have been applied.")
+}
+
 // eclipse IDE integration
 eclipse {
 	classpath {

diff --git a/src/bindings/jna/libelektra/src/test/java/org/libelektra/AllTests.java b/src/bindings/jna/libelektra/src/test/java/org/libelektra/AllTests.java
diff --git a/src/bindings/jna/libelektra/test-exclusion.gradle.in b/src/bindings/jna/libelektra/test-exclusion.gradle.in
@@ -1,3 +1,4 @@
-test {
-	@GRADLE_TEST_EXCLUDES@
+tasks.named('test').configure {
+	filter {
+@GRADLE_TEST_EXCLUDES@	}
 }