@@ -526,22 +526,19 @@ object Build {
526
526
(sourceManaged in Compile ).value
527
527
}
528
528
val externalDeps = externalCompilerClasspathTask.value
529
- val externalJSDeps = (externalDependencyClasspath in (LocalProject (" dotty-library-bootstrappedJS" ), Compile )).value
530
529
val jars = packageAll.value
531
530
532
531
Seq (
533
532
" -Ddotty.tests.dottyCompilerManagedSources=" + managedSrcDir,
534
533
" -Ddotty.tests.classes.dottyInterfaces=" + jars(" dotty-interfaces" ),
535
534
" -Ddotty.tests.classes.dottyLibrary=" + jars(" dotty-library" ),
536
- " -Ddotty.tests.classes.dottyLibraryJS=" + jars(" dotty-library-js" ),
537
535
" -Ddotty.tests.classes.dottyCompiler=" + jars(" dotty-compiler" ),
538
536
" -Ddotty.tests.classes.tastyCore=" + jars(" tasty-core" ),
539
537
" -Ddotty.tests.classes.compilerInterface=" + findArtifactPath(externalDeps, " compiler-interface" ),
540
538
" -Ddotty.tests.classes.scalaLibrary=" + findArtifactPath(externalDeps, " scala-library" ),
541
539
" -Ddotty.tests.classes.scalaAsm=" + findArtifactPath(externalDeps, " scala-asm" ),
542
540
" -Ddotty.tests.classes.jlineTerminal=" + findArtifactPath(externalDeps, " jline-terminal" ),
543
541
" -Ddotty.tests.classes.jlineReader=" + findArtifactPath(externalDeps, " jline-reader" ),
544
- " -Ddotty.tests.classes.scalaJSLibrary=" + findArtifactPath(externalJSDeps, " scalajs-library_2.13" ),
545
542
)
546
543
},
547
544
@@ -708,8 +705,7 @@ object Build {
708
705
// running the compiler, we should always have the bootstrapped
709
706
// library on the compiler classpath since the non-bootstrapped one
710
707
// may not be binary-compatible.
711
- " dotty-library" -> packageBin.in(`dotty-library-bootstrapped`, Compile ).value,
712
- " dotty-library-js" -> packageBin.in(`dotty-library-bootstrappedJS`, Compile ).value,
708
+ " dotty-library" -> packageBin.in(`dotty-library-bootstrapped`, Compile ).value
713
709
).mapValues(_.getAbsolutePath)
714
710
}
715
711
}.value,
@@ -1144,6 +1140,27 @@ object Build {
1144
1140
}
1145
1141
)
1146
1142
1143
+ lazy val sjsCompilerTests = project.in(file(" tests/sjs-compiler-tests" )).
1144
+ dependsOn(`dotty-compiler` % " test->test" ).
1145
+ settings(
1146
+ commonNonBootstrappedSettings,
1147
+ outputStrategy := Some (StdoutOutput ),
1148
+
1149
+ // Change the baseDirectory when running the tests
1150
+ baseDirectory in Test := baseDirectory.value.getParentFile.getParentFile,
1151
+
1152
+ javaOptions ++= (javaOptions in `dotty-compiler`).value,
1153
+ javaOptions ++= {
1154
+ val externalJSDeps = (externalDependencyClasspath in (`dotty-library-bootstrappedJS`, Compile )).value
1155
+ val dottyLibraryJSJar = (packageBin in (`dotty-library-bootstrappedJS`, Compile )).value.getAbsolutePath
1156
+
1157
+ Seq (
1158
+ " -Ddotty.tests.classes.dottyLibraryJS=" + dottyLibraryJSJar,
1159
+ " -Ddotty.tests.classes.scalaJSLibrary=" + findArtifactPath(externalJSDeps, " scalajs-library_2.13" ),
1160
+ )
1161
+ },
1162
+ )
1163
+
1147
1164
lazy val `dotty-bench` = project.in(file(" bench" )).asDottyBench(NonBootstrapped )
1148
1165
lazy val `dotty-bench-bootstrapped` = project.in(file(" bench" )).asDottyBench(Bootstrapped )
1149
1166
lazy val `dotty-bench-run` = project.in(file(" bench-run" )).asDottyBench(Bootstrapped )
0 commit comments