diff options
| author | Dmitry Petrashko <dark@d-d.me> | 2015-10-23 13:18:14 +0200 |
|---|---|---|
| committer | Dmitry Petrashko <dark@d-d.me> | 2015-10-23 13:18:14 +0200 |
| commit | 3c6f28ba36e3e908c7a5e313e96e7d34f3da62fe (patch) | |
| tree | 10ad0bcd2bd89275cd82c60c631bcacd82dafba6 | |
| parent | 73f725c361a8d990d698c0aeb6889e272759ebeb (diff) | |
| parent | 1f9131273dc0ac9811532a35349c6bd58711eb7e (diff) | |
| download | dotty-3c6f28ba36e3e908c7a5e313e96e7d34f3da62fe.tar.gz dotty-3c6f28ba36e3e908c7a5e313e96e7d34f3da62fe.tar.bz2 dotty-3c6f28ba36e3e908c7a5e313e96e7d34f3da62fe.zip | |
Merge pull request #852 from dotty-staging/fix-script
Fix bug in dotc script
| -rwxr-xr-x | bin/dotc | 2 | ||||
| -rw-r--r-- | test/dotc/build.scala | 1 |
2 files changed, 2 insertions, 1 deletions
@@ -192,7 +192,7 @@ trap onExit INT # If using the boot classpath, also pass an empty classpath # to java to suppress "." from materializing. classpathArgs () { - if [[ -n $bootstrapped ]]; then + if [[ "true" == $bootstrapped ]]; then checkjar $DOTTY_JAR "test:runMain dotc.build" src toolchain="$DOTTY_JAR:$SCALA_LIBRARY_JAR:$SCALA_REFLECT_JAR:$SCALA_COMPILER_JAR:$JLINE_JAR" else diff --git a/test/dotc/build.scala b/test/dotc/build.scala index cb5f7ab95..9f47796c3 100644 --- a/test/dotc/build.scala +++ b/test/dotc/build.scala @@ -19,6 +19,7 @@ object build extends tests { } def main(args: Array[String]): Unit = { + println("------------ Building dotty ------------") deleteFilesInFolder(new File(defaultOutputDir)) // clear previous output dotty // build output dir val p = Runtime.getRuntime.exec(Array("jar", "cf", "dotty.jar", "-C", "out", ".")) |