Skip to content

Remove compiler from class path of run tests while running #3668

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
merged 1 commit into from
Dec 15, 2017
Merged

Remove compiler from class path of run tests while running #3668

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
3 changes: 2 additions & 1 deletion compiler/test/dotty/tools/vulpix/TestConfiguration.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ object TestConfiguration {
)

val classPath = mkClassPath(Jars.dottyTestDeps)
val runClassPath = mkClassPath(Jars.dottyLib :: Nil)

def mkClassPath(classPaths: List[String]): String = {
classPaths map { p =>
Expand Down Expand Up @@ -46,7 +47,7 @@ object TestConfiguration {
val yCheckOptions = Array("-Ycheck:tailrec,resolveSuper,erasure,mixin,getClass,elimStaticThis,labelDef")

val basicDefaultOptions = checkOptions ++ noCheckOptions ++ yCheckOptions
val defaultUnoptimised = TestFlags(classPath, basicDefaultOptions)
val defaultUnoptimised = TestFlags(classPath, runClassPath, basicDefaultOptions)
val defaultOptimised = defaultUnoptimised and "-optimise"
val defaultOptions = defaultUnoptimised
val allowDeepSubtypes = defaultOptions without "-Yno-deep-subtypes"
Expand Down
3 changes: 3 additions & 0 deletions compiler/test/dotty/tools/vulpix/TestFlags.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ final case class TestFlags(
def withClasspath(classPath: String): TestFlags =
TestFlags(s"$defaultClassPath:$classPath", runClassPath, options)

def withRunClasspath(classPath: String): TestFlags =
TestFlags(defaultClassPath, s"$runClassPath:$classPath", options)

def all: Array[String] = Array("-classpath", defaultClassPath) ++ options
}

Expand Down