@@ -45,53 +45,53 @@ class TestScripts {
4545 @ Before def buildUp = deletePackages
4646 @ After def tearDown = deletePackages
4747
48- /** bin/dotc script should be able to build hello world and successfully
49- * execute it using dotr
48+ /** bin/scalac script should be able to build hello world and successfully
49+ * execute it using scala
5050 */
5151 @ Test def buildAndRunHelloWorld = doUnlessWindows {
52- val (retDotc, dotcOutput) = executeScript(" ./bin/dotc ./tests/pos/HelloWorld.scala"
52+ val (retDotc, dotcOutput) = executeScript(" ./bin/scalac ./tests/pos/HelloWorld.scala"
5353
54- // Check correct output of building and running dotc
54+ // Check correct output of building and running scalac
5555 assert(
5656 retDotc == 0 ,
57- s " bin/dotc script did not run properly. Output: $lineSep$dotcOutput"
57+ s " bin/scalac script did not run properly. Output: $lineSep$dotcOutput"
5858 )
5959
60- val (retDotr, dotrOutput) = executeScript(" ./bin/dotr HelloWorld"
60+ val (retDotr, dotrOutput) = executeScript(" ./bin/scala HelloWorld"
6161 assert(
6262 retDotr == 0 && dotrOutput == " hello world\n "
6363 s " Running hello world exited with status: $retDotr and output: $dotrOutput"
6464 )
6565 }
6666
67- /** bin/dotc script should be able to detect changes in dotty sources and
67+ /** bin/scalac script should be able to detect changes in dotty sources and
6868 * rebuild dotty if needed
6969 */
7070 @ Test def rebuildIfNecessary = doUnlessWindows {
71- val (retFirstBuild, out1) = executeScript(" ./bin/dotc ./tests/pos/HelloWorld.scala"
72- assert(retFirstBuild == 0 , s " building dotc failed: $out1" )
71+ val (retFirstBuild, out1) = executeScript(" ./bin/scalac ./tests/pos/HelloWorld.scala"
72+ assert(retFirstBuild == 0 , s " building scalac failed: $out1" )
7373
7474 // Create a new file to force rebuild
7575 new JFile (" ./compiler/src/dotty/tools/dotc/Dummy.scala"
7676
77- val (retSecondBuild, output) = executeScript(" ./bin/dotc ./tests/pos/HelloWorld.scala"
77+ val (retSecondBuild, output) = executeScript(" ./bin/scalac ./tests/pos/HelloWorld.scala"
7878 assert(
7979 retSecondBuild == 0 && output.contains(" rebuilding"
8080 s " Rebuilding the tool should result in jar files being rebuilt. Status: $retSecondBuild, output: $lineSep$output" )
8181 }
8282
83- /** if no changes to dotty, dotc script should be fast */
83+ /** if no changes to dotty, scalac script should be fast */
8484 @ Test def beFastOnNoChanges = doUnlessWindows {
85- val (retFirstBuild, _) = executeScript(" ./bin/dotc ./tests/pos/HelloWorld.scala"
86- assert(retFirstBuild == 0 , " building dotc failed"
85+ val (retFirstBuild, _) = executeScript(" ./bin/scalac ./tests/pos/HelloWorld.scala"
86+ assert(retFirstBuild == 0 , " building scalac failed"
8787
88- val (ret, output) = executeScript(" ./bin/dotc ./tests/pos/HelloWorld.scala"
88+ val (ret, output) = executeScript(" ./bin/scalac ./tests/pos/HelloWorld.scala"
8989 assert(
9090 ret == 0 && ! output.contains(" rebuilding"
9191 s " Project recompiled when it didn't need to be. Status $ret, output: $lineSep$output" )
9292 }
9393
94- /** dotc script should work after corrupting .packages */
94+ /** scalac script should work after corrupting .packages */
9595 @ Test def reCreatesPackagesIfNecessary = doUnlessWindows {
9696 import java .nio .file .{Paths , Files }
9797 import java .nio .charset .StandardCharsets
@@ -104,8 +104,8 @@ class TestScripts {
104104
105105 Files .write(Paths .get(" ./.packages" StandardCharsets .UTF_8 ))
106106
107- val (retFirstBuild, output) = executeScript(" ./bin/dotc ./tests/pos/HelloWorld.scala"
107+ val (retFirstBuild, output) = executeScript(" ./bin/scalac ./tests/pos/HelloWorld.scala"
108108 assert(output.contains(" .packages file corrupted"
109- assert(retFirstBuild == 0 , " building dotc failed"
109+ assert(retFirstBuild == 0 , " building scalac failed"
110110 }
111111}
0 commit comments