Skip to content

Add a DOTTY_SCALA_LIBRARY env variable to run the tests with Eclipse #2320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
odersky merged 1 commit into from
Apr 27, 2017
Merged

Add a DOTTY_SCALA_LIBRARY env variable to run the tests with Eclipse #2320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions compiler/test/dotty/Jars.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,14 @@ object Jars {
val dottyTestDeps: List[String] =
dottyLib :: dottyCompiler :: dottyInterfaces :: dottyExtras

def scalaLibrary: String = sys.env.get("DOTTY_SCALA_LIBRARY")
.getOrElse(findJarFromRuntime("scala-library-2."))

/** Gets the scala 2.* library at runtime, note that doing this is unsafe
* unless you know that the library will be on the classpath of the running
* application. It is currently safe to call this function if the tests are
* run by sbt.
*/
def scalaLibraryFromRuntime: String = findJarFromRuntime("scala-library-2.")

private def findJarFromRuntime(partialName: String) = {
val urls = ClassLoader.getSystemClassLoader.asInstanceOf[java.net.URLClassLoader].getURLs.map(_.getFile.toString)
urls.find(_.contains(partialName)).getOrElse {
Expand Down
2 changes: 1 addition & 1 deletion compiler/test/dotty/tools/vulpix/ParallelTesting.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
val fullArgs = Array(
"javac",
"-classpath",
s".:${Jars.scalaLibraryFromRuntime}:${targetDir.getAbsolutePath}"
s".:${Jars.scalaLibrary}:${targetDir.getAbsolutePath}"
) ++ flags.takeRight(2) ++ fs

Runtime.getRuntime.exec(fullArgs).waitFor() == 0
Expand Down
2 changes: 1 addition & 1 deletion compiler/test/dotty/tools/vulpix/RunnerOrchestration.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ trait RunnerOrchestration {
val sep = sys.props("file.separator")
val cp =
classOf[ChildJVMMain].getProtectionDomain.getCodeSource.getLocation.getFile + ":" +
Jars.scalaLibraryFromRuntime
Jars.scalaLibrary
val javaBin = sys.props("java.home") + sep + "bin" + sep + "java"
new ProcessBuilder(javaBin, "-cp", cp, "dotty.tools.vulpix.ChildJVMMain")
.redirectErrorStream(true)
Expand Down