apply system properties to all test framworks

scalacenter · Oct 1, 2018 · 2a92c5d · 2a92c5d
1 parent 08cbc80
commit 2a92c5d
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/frontend/src/main/scala/bloop/engine/tasks/Tasks.scala b/frontend/src/main/scala/bloop/engine/tasks/Tasks.scala
@@ -142,10 +142,18 @@ object Tasks {
             List(Config.TestArgument(rawArgs, Some(Config.TestFramework(List(cls)))))
           case frameworks =>
             val frameworkNames = foundFrameworks(frameworks)
-            val ignoredArgs = frameworkSpecificRawArgs.mkString(" ")
-            logger.warn(
+            val (sysProperties, ignoredArgs) = frameworkSpecificRawArgs.partition(s => s.startsWith("-D"))
+
+            if(ignoredArgs.nonEmpty)
+              logger.warn(
               s"Ignored CLI test options '${ignoredArgs}' can only be applied to one framework, found: $frameworkNames")
-            Nil
+
+            val cls = frameworks.map(f => f.getClass.getName)
+
+            if(sysProperties.isEmpty)
+              Nil
+            else
+              List(Config.TestArgument(sysProperties, Some(Config.TestFramework(cls))))
         }
       }
     }