Skip to content

Commit 5b99d74

Browse files
committed
Do not put tests.jar on the class path in dot.
1 parent 2bfbb8e commit 5b99d74

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

bin/dotc

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ ReplMain=test.DottyRepl
4242

4343
# autodetecting the compiler jar. this is location where sbt 'packages' it
4444
MAIN_JAR=$DOTTY_ROOT/target/scala-$SCALA_BINARY_VERSION/dotty_$SCALA_BINARY_VERSION-$DOTTY_VERSION.jar
45-
TEST_JAR=$DOTTY_ROOT/target/scala-$SCALA_BINARY_VERSION/dotty_$SCALA_BINARY_VERSION-$DOTTY_VERSION-tests.jar
45+
#TEST_JAR=$DOTTY_ROOT/target/scala-$SCALA_BINARY_VERSION/dotty_$SCALA_BINARY_VERSION-$DOTTY_VERSION-tests.jar
46+
4647
function checkjar {
4748
if [ ! -f "$1" ]
4849
then
@@ -61,7 +62,7 @@ function checkjar {
6162
}
6263

6364
checkjar $MAIN_JAR package
64-
checkjar $TEST_JAR test:package
65+
#checkjar $TEST_JAR test:package
6566

6667
# Autodetecting the scala-library location, in case it wasn't provided by an environment variable
6768
if [ "$SCALA_LIBRARY_JAR" == "" ]
@@ -179,9 +180,9 @@ trap onExit INT
179180
# to java to suppress "." from materializing.
180181
classpathArgs () {
181182
if [[ -n $bootcp ]]; then
182-
echo "-Xbootclasspath/a:$SCALA_LIBRARY_JAR:$SCALA_REFLECT_JAR:$SCALA_COMPILER_JAR:$JLINE_JAR:$MAIN_JAR -classpath $MAIN_JAR:$TEST_JAR"
183+
echo "-Xbootclasspath/a:$SCALA_LIBRARY_JAR:$SCALA_REFLECT_JAR:$SCALA_COMPILER_JAR:$JLINE_JAR:$MAIN_JAR -classpath $MAIN_JAR"
183184
else
184-
echo "-classpath $SCALA_LIBRARY_JAR:$SCALA_REFLECT_JAR:$SCALA_COMPILER_JAR:$JLINE_JAR:$MAIN_JAR:$TEST_JAR"
185+
echo "-classpath $SCALA_LIBRARY_JAR:$SCALA_REFLECT_JAR:$SCALA_COMPILER_JAR:$JLINE_JAR:$MAIN_JAR"
185186
fi
186187
}
187188

0 commit comments

Comments
 (0)