More options

Author: breskeby

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/ElasticsearchTestBasePluginFuncTest.groovy

@@ -54,6 +54,11 @@ class ElasticsearchTestBasePluginFuncTest extends AbstractGradleFuncTest {
         then:
         result.task(':test').outcome == TaskOutcome.SUCCESS
 
+        when:
+        result = gradleRunner("test", "-Dtests.jvm.argline=-disableassertions").build()
+        then:
+        result.task(':test').outcome == TaskOutcome.SUCCESS
+
         when:
         result = gradleRunner("test", "-Dtests.asserts=false", "-Dtests.jvm.argline=-da").build()
         then:

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchTestBasePlugin.java

@@ -138,7 +138,8 @@ public void execute(Task t) {
             }
 
             // Check if "tests.asserts" is false or "tests.jvm.argline" contains the "-da" flag.
-            boolean enableAssertions = Util.getBooleanProperty("tests.asserts", true) && (argline == null || !argline.contains("-da"));
+            boolean enableAssertions = Util.getBooleanProperty("tests.asserts", true)
+                && (argline == null || argline.contains("-da") == false || argline.contains("-disableassertions") == false);
 
             test.setEnableAssertions(enableAssertions);
             Map<String, String> sysprops = Map.of(