diff options
| author | Guillaume Martres <smarter@ubuntu.com> | 2017-01-11 04:05:49 +0100 |
|---|---|---|
| committer | Guillaume Martres <smarter@ubuntu.com> | 2017-01-27 13:54:28 +0100 |
| commit | 6419a0668b3d4e0bfd42f9a1f69fde66a3944fd6 (patch) | |
| tree | 3ca3707efda30a7d5196449ba45833bd84b83d90 /project | |
| parent | 0c97f764fec6881abc812e0066cdebb3e0c6ce8a (diff) | |
| download | dotty-6419a0668b3d4e0bfd42f9a1f69fde66a3944fd6.tar.gz dotty-6419a0668b3d4e0bfd42f9a1f69fde66a3944fd6.tar.bz2 dotty-6419a0668b3d4e0bfd42f9a1f69fde66a3944fd6.zip | |
Do not hardcode jars path in the tests, instead get them from sbt
This is necessary to run the tests with the bootstrapped projects and is
just much better than hardcoding them anyway.
Diffstat (limited to 'project')
| -rw-r--r-- | project/Build.scala | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/project/Build.scala b/project/Build.scala index af862817c..de4ab563f 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -326,7 +326,7 @@ object DottyBuild extends Build { // http://grokbase.com/t/gg/simple-build-tool/135ke5y90p/sbt-setting-jvm-boot-paramaters-for-scala // packageAll should always be run before tests - javaOptions <++= (dependencyClasspath in Runtime, packageAll) map { (attList, _) => + javaOptions <++= (dependencyClasspath in Runtime, packageAll) map { (attList, pA) => // put needed dependencies on classpath: val path = for { file <- attList.map(_.data) @@ -356,7 +356,13 @@ object DottyBuild extends Build { List("-XX:+TieredCompilation", "-XX:TieredStopAtLevel=1") else List() - ("-DpartestParentID=" + pid) :: tuning ::: agentOptions ::: ci_build ::: path.toList + val jars = List( + "-Ddotty.tests.classes.interfaces=" + pA("dotty-interfaces"), + "-Ddotty.tests.classes.library=" + pA("dotty-library"), + "-Ddotty.tests.classes.compiler=" + pA("dotty-compiler") + ) + + ("-DpartestParentID=" + pid) :: jars ::: tuning ::: agentOptions ::: ci_build ::: path.toList } ). settings(publishing) |