Adapt testing framework to new infix scheme

Author: odersky

compiler/test/dotty/tools/vulpix/ParallelTesting.scala

@@ -331,7 +331,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
 
     protected def compile(files0: Array[JFile], flags0: TestFlags, suppressErrors: Boolean, targetDir: JFile): TestReporter = {
 
-      val flags = flags0 and ("-d", targetDir.getAbsolutePath)
+      val flags = flags0.and("-d", targetDir.getAbsolutePath)
 
       def flattenFiles(f: JFile): Array[JFile] =
         if (f.isDirectory) f.listFiles.flatMap(flattenFiles)
@@ -400,7 +400,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
     protected def compileFromTasty(flags0: TestFlags, suppressErrors: Boolean, targetDir: JFile): TestReporter = {
       val tastyOutput = new JFile(targetDir.getPath + "_from-tasty")
       tastyOutput.mkdir()
-      val flags = flags0 and ("-d", tastyOutput.getAbsolutePath) and "-from-tasty"
+      val flags = flags0.and("-d", tastyOutput.getAbsolutePath).and("-from-tasty")
 
       def hasTastyFileToClassName(f: JFile): String =
         targetDir.toPath.relativize(f.toPath).toString.dropRight(".hasTasty".length).replace('/', '.')
@@ -427,8 +427,10 @@ trait ParallelTesting extends RunnerOrchestration { self =>
       val decompilationOutput = new JFile(targetDir.getPath)
       decompilationOutput.mkdir()
       val flags =
-        flags0 and ("-d", decompilationOutput.getAbsolutePath) and
-        "-decompile" and "-pagewidth" and "80"
+        flags0
+          .and("-d", decompilationOutput.getAbsolutePath)
+          .and("-decompile")
+          .and("-pagewidth", "80")
 
       def hasTastyFileToClassName(f: JFile): String =
         targetDir.toPath.relativize(f.toPath).toString.dropRight(".hasTasty".length).replace('/', '.')

compiler/test/dotty/tools/vulpix/TestConfiguration.scala

@@ -49,18 +49,18 @@ object TestConfiguration {
 
   val basicDefaultOptions = checkOptions ++ noCheckOptions ++ yCheckOptions
   val defaultUnoptimised = TestFlags(classPath, runClassPath, basicDefaultOptions)
-  val defaultOptimised = defaultUnoptimised and "-optimise"
+  val defaultOptimised = defaultUnoptimised.and("-optimise")
   val defaultOptions = defaultUnoptimised
   val defaultRunWithCompilerOptions = defaultOptions.withRunClasspath(Jars.dottyRunWithCompiler.mkString(":"))
   val allowDeepSubtypes = defaultOptions without "-Yno-deep-subtypes"
   val allowDoubleBindings = defaultOptions without "-Yno-double-bindings"
-  val picklingOptions = defaultUnoptimised and (
+  val picklingOptions = defaultUnoptimised.and(
     "-Xprint-types",
     "-Ytest-pickler",
     "-Yprint-pos",
     "-Yprint-pos-syms"
   )
-  val scala2Mode = defaultOptions and "-language:Scala2"
-  val explicitUTF8 = defaultOptions and ("-encoding", "UTF8")
-  val explicitUTF16 = defaultOptions and ("-encoding", "UTF16")
+  val scala2Mode = defaultOptions.and("-language:Scala2")
+  val explicitUTF8 = defaultOptions.and("-encoding", "UTF8")
+  val explicitUTF16 = defaultOptions.and("-encoding", "UTF16")
 }