diff options
| author | Paul Phillips <paulp@improving.org> | 2012-12-06 12:13:35 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-12-06 12:13:35 -0800 |
| commit | 330c77b097782ed389a83175302379ea72d22c41 (patch) | |
| tree | 8c7a1eb9f25d724b27d5ca33704ccb43bc0a7cb9 /test/disabled/presentation/simple-tests.opts | |
| parent | b1cb6578bdbdfaa66d3cf09f40dfc1511f7e9711 (diff) | |
| parent | 06844ee821ae500c7485498cc2054e3cf765623f (diff) | |
| download | scala-330c77b097782ed389a83175302379ea72d22c41.tar.gz scala-330c77b097782ed389a83175302379ea72d22c41.tar.bz2 scala-330c77b097782ed389a83175302379ea72d22c41.zip | |
Merge commit 'refs/pull/1717/head' into merge-msil-genjvm-delete
* commit 'refs/pull/1717/head':
SI-6769 Removes GenJVM backend
Conflicts:
src/compiler/scala/tools/nsc/backend/jvm/GenAndroid.scala
Diffstat (limited to 'test/disabled/presentation/simple-tests.opts')
| -rw-r--r-- | test/disabled/presentation/simple-tests.opts | 4 |
1 files changed, 2 insertions, 2 deletions
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 |