diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/disabled/presentation/akka.flags | 4 | ||||
-rw-r--r-- | test/disabled/presentation/simple-tests.opts | 4 | ||||
-rw-r--r-- | test/files/ant/imported.xml | 5 |
3 files changed, 4 insertions, 9 deletions
diff --git a/test/disabled/presentation/akka.flags b/test/disabled/presentation/akka.flags index 56d026a62d..9bf2878f62 100644 --- a/test/disabled/presentation/akka.flags +++ b/test/disabled/presentation/akka.flags @@ -12,7 +12,7 @@ # running partest from. Run it from the root scala checkout for these files to resolve correctly # (by default when running 'ant test', or 'test/partest'). Paths use Unix separators, the test # framework translates them to the platform dependent representation. -# -bootclasspath lib/scala-compiler.jar:lib/scala-library.jar:lib/fjbg.jar +# -bootclasspath lib/scala-compiler.jar:lib/scala-library.jar # the following line would test using the quick compiler -# -bootclasspath build/quick/classes/compiler:build/quick/classes/library:lib/fjbg.jar +# -bootclasspath build/quick/classes/compiler:build/quick/classes/library diff --git a/test/disabled/presentation/simple-tests.opts b/test/disabled/presentation/simple-tests.opts index 8529bbf1a0..d651316984 100644 --- a/test/disabled/presentation/simple-tests.opts +++ b/test/disabled/presentation/simple-tests.opts @@ -12,7 +12,7 @@ # running partest from. Run it from the root scala checkout for these files to resolve correctly # (by default when running 'ant test', or 'test/partest'). Paths use Unix separators, the test # framework translates them to the platform dependent representation. --bootclasspath lib/scala-compiler.jar:lib/scala-library.jar:lib/fjbg.jar +-bootclasspath lib/scala-compiler.jar:lib/scala-library.jar # the following line would test using the quick compiler -# -bootclasspath build/quick/classes/compiler:build/quick/classes/library:lib/fjbg.jar +# -bootclasspath build/quick/classes/compiler:build/quick/classes/library diff --git a/test/files/ant/imported.xml b/test/files/ant/imported.xml index 5a4dfc319b..182c80aadf 100644 --- a/test/files/ant/imported.xml +++ b/test/files/ant/imported.xml @@ -56,7 +56,6 @@ INITIALISATION <property name="scala.dir" value="${quick.dir}"/> <property name="scala-library.lib" value="${scala.dir}/classes/library/"/> <property name="scala-compiler.lib" value="${scala.dir}/classes/compiler/"/> - <property name="fjbg.lib" value="${project.dir}/lib/fjbg.jar"/> </target> <target name="pack.init" if="pack.binary"> @@ -67,7 +66,6 @@ INITIALISATION <property name="scala.dir" value="${pack.dir}"/> <property name="scala-library.lib" value="${scala.dir}/lib/scala-library.jar"/> <property name="scala-compiler.lib" value="${scala.dir}/lib/scala-compiler.jar"/> - <property name="fjbg.lib" value=""/> </target> <target name="latest.init" if="latest.binary"> @@ -78,7 +76,6 @@ INITIALISATION <property name="scala.dir" value="${latest.dir}"/> <property name="scala-library.lib" value="${scala.dir}/lib/scala-library.jar"/> <property name="scala-compiler.lib" value="${scala.dir}/lib/scala-compiler.jar"/> - <property name="fjbg.lib" value=""/> </target> <target name="installed.init" if="installed.binary"> @@ -89,7 +86,6 @@ INITIALISATION <property name="scala.dir" value="${installed.dir}"/> <property name="scala-library.lib" value="${scala.dir}/lib/scala-library.jar"/> <property name="scala-compiler.lib" value="${scala.dir}/lib/scala-compiler.jar"/> - <property name="fjbg.lib" value=""/> </target> <target name="init" depends="quick.init, pack.init, latest.init, installed.init"> @@ -98,7 +94,6 @@ INITIALISATION <path id="scala.classpath"> <pathelement location="${scala-library.lib}"/> <pathelement location="${scala-compiler.lib}"/> - <pathelement location="${fjbg.lib}"/> <!-- only present for 'quick' --> </path> <fail message="Scala library '${scala-library.lib}' or '${scala-compiler.lib}' is missing/broken"> |