Skip to content

Commit 0745c34

Browse files
committed
Add simple tests
1 parent fd5d1bb commit 0745c34

File tree

3 files changed

+22
-4
lines changed

3 files changed

+22
-4
lines changed

Diff for: compiler/src/dotty/tools/repl/ReplDriver.scala

+1-4
Original file line numberDiff line numberDiff line change
@@ -560,11 +560,8 @@ class ReplDriver(settings: Array[String],
560560
val prevClassLoader = rendering.classLoader()(using state.context)
561561
val jarClassLoader = fromURLsParallelCapable(
562562
ClassPathFactory.newClassPath(jarFile)(using rootCtx).asURLs, prevClassLoader)
563-
// val replOutputClassLoader = new AbstractFileClassLoader(
564-
// prevOutputDir, jarClassLoader)
565563
rendering.myClassLoader = new AbstractFileClassLoader(
566-
rootCtx.settings.outputDir.valueIn(rootCtx.settingsState), jarClassLoader) //replOutputClassLoader)
567-
println(s"new classpath: ${s.context.platform.classPath(using s.context)}")
564+
rootCtx.settings.outputDir.valueIn(rootCtx.settingsState), jarClassLoader)
568565
out.println(s"Added '$path' to classpath.")
569566
s
570567

Diff for: compiler/test-resources/repl/require-command

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
scala> val z = 1
2+
val z: Int = 1
3+
4+
scala>:require sbt-test/source-dependencies/canon/actual/a.jar
5+
Added 'sbt-test/source-dependencies/canon/actual/a.jar' to classpath.
6+
7+
scala> import A.x
8+
9+
scala> x
10+
val res0: Int = 3
11+
12+
scala> z
13+
val res1: Int = 1

Diff for: compiler/test-resources/repl/require-errors

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
scala>:require path/does/not/exist
2+
Cannot add "path/does/not/exist" to classpath.
3+
4+
scala>:require sbt-test/source-dependencies/canon/actual/a.jar
5+
Added 'sbt-test/source-dependencies/canon/actual/a.jar' to classpath.
6+
7+
scala>:require sbt-test/source-dependencies/canon/actual/a.jar
8+
The path 'sbt-test/source-dependencies/canon/actual/a.jar' cannot be loaded, it contains a classfile that already exists on the classpath: sbt-test/source-dependencies/canon/actual/a.jar(A.class)

0 commit comments

Comments
 (0)