@@ -85,35 +85,30 @@ class BashScriptsTests:
85
85
86
86
/* verify that `dist/bin/scala` correctly passes args to the jvm via -J-D for script envtest.sc */
87
87
@ Test def verifyScJProperty =
88
- assumeFalse(" Scripts do not yet support Scala 2 library TASTy" , Properties .usingScalaLibraryTasty)
89
88
val tag = " World1"
90
89
val stdout = callScript(tag, envtestSc, s " -J-Dkey " )
91
90
assertEquals( s " Hello $tag" , stdout)
92
91
93
92
/* verify that `dist/bin/scala` correctly passes args to the jvm via -J-D for script envtest.scala */
94
93
@ Test def verifyScalaJProperty =
95
- assumeFalse(" Scripts do not yet support Scala 2 library TASTy" , Properties .usingScalaLibraryTasty)
96
94
val tag = " World2"
97
95
val stdout = callScript(tag, envtestScala, s " -J-Dkey " )
98
96
assertEquals(s " Hello $tag" , stdout)
99
97
100
98
/* verify that `dist/bin/scala` can set system properties via -D for envtest.sc */
101
99
@ Test def verifyScDProperty =
102
- assumeFalse(" Scripts do not yet support Scala 2 library TASTy" , Properties .usingScalaLibraryTasty)
103
100
val tag = " World3"
104
101
val stdout = callScript(tag, envtestSc, s " -Dkey " )
105
102
assertEquals(s " Hello $tag" , stdout)
106
103
107
104
/* verify that `dist/bin/scala` can set system properties via -D for envtest.scala */
108
105
@ Test def verifyScalaDProperty =
109
- assumeFalse(" Scripts do not yet support Scala 2 library TASTy" , Properties .usingScalaLibraryTasty)
110
106
val tag = " World4"
111
107
val stdout = callScript(tag, envtestScala, s " -Dkey " )
112
108
assertEquals(s " Hello $tag" , stdout)
113
109
114
110
/* verify that `dist/bin/scala` can set system properties via -D when executing compiled script via -jar envtest.jar */
115
111
@ Test def saveAndRunWithDProperty =
116
- assumeFalse(" Scripts do not yet support Scala 2 library TASTy" , Properties .usingScalaLibraryTasty)
117
112
val commandline = Seq (" SCALA_OPTS= " , scalaPath.relpath, " -save" , envtestScala.relpath).mkString(" " )
118
113
val (_, _, _, _) = bashCommand(commandline) // compile jar, discard output
119
114
val testJar = testFile(" envtest.jar" ) // jar is created by the previous bashCommand()
@@ -131,7 +126,6 @@ class BashScriptsTests:
131
126
132
127
/* verify `dist/bin/scalac` non-interference with command line args following script name */
133
128
@ Test def verifyScalacArgs =
134
- assumeFalse(" Scripts do not yet support Scala 2 library TASTy" , Properties .usingScalaLibraryTasty)
135
129
val commandline = (Seq (" SCALA_OPTS= " , scalacPath, " -script" , showArgsScript) ++ testScriptArgs).mkString(" " )
136
130
val (validTest, exitCode, stdout, stderr) = bashCommand(commandline)
137
131
if verifyValid(validTest) then
@@ -147,7 +141,6 @@ class BashScriptsTests:
147
141
148
142
/* verify `dist/bin/scala` non-interference with command line args following script name */
149
143
@ Test def verifyScalaArgs =
150
- assumeFalse(" Scripts do not yet support Scala 2 library TASTy" , Properties .usingScalaLibraryTasty)
151
144
val commandline = (Seq (" SCALA_OPTS= " , scalaPath, showArgsScript) ++ testScriptArgs).mkString(" " )
152
145
val (validTest, exitCode, stdout, stderr) = bashCommand(commandline)
153
146
if verifyValid(validTest) then
@@ -167,7 +160,7 @@ class BashScriptsTests:
167
160
*/
168
161
@ Category (Array (classOf [BootstrappedOnlyTests ]))
169
162
@ Test def verifyScriptPathProperty =
170
- assumeFalse(" Scripts do not yet support Scala 2 library TASTy" , Properties .usingScalaLibraryTasty)
163
+ assumeFalse(" Scripts do not yet support fully Scala 2 library TASTy" , Properties .usingScalaLibraryTasty)
171
164
val scriptFile = testFiles.find(_.getName == " scriptPath.sc" ).get
172
165
val expected = s " ${scriptFile.getName}"
173
166
printf(" ===> verify valid system property script.path is reported by script [%s]\n " , scriptFile.getName)
@@ -184,7 +177,7 @@ class BashScriptsTests:
184
177
* verify SCALA_OPTS can specify an @argsfile when launching a scala script in `dist/bin/scala`.
185
178
*/
186
179
@ Test def verifyScalaOpts =
187
- assumeFalse(" Scripts do not yet support Scala 2 library TASTy" , Properties .usingScalaLibraryTasty)
180
+ assumeFalse(" Scripts do not yet support fully Scala 2 library TASTy" , Properties .usingScalaLibraryTasty)
188
181
val scriptFile = testFiles.find(_.getName == " classpathReport.sc" ).get
189
182
printf(" ===> verify SCALA_OPTS='@argsfile' is properly handled by `dist/bin/scala`\n " )
190
183
val envPairs = List ((" SCALA_OPTS" , s " @ $argsfile" ))
@@ -207,7 +200,7 @@ class BashScriptsTests:
207
200
* verify that individual scripts can override -save with -nosave (needed to address #13760).
208
201
*/
209
202
@ Test def sqlDateTest =
210
- assumeFalse(" Scripts do not yet support Scala 2 library TASTy" , Properties .usingScalaLibraryTasty)
203
+ assumeFalse(" Scripts do not yet support fully Scala 2 library TASTy" , Properties .usingScalaLibraryTasty)
211
204
val scriptBase = " sqlDateError"
212
205
val scriptFile = testFiles.find(_.getName == s " $scriptBase.sc " ).get
213
206
val testJar = testFile(s " $scriptBase.jar " ) // jar should not be created when scriptFile runs
@@ -232,7 +225,6 @@ class BashScriptsTests:
232
225
* verify -e println("yo!") works.
233
226
*/
234
227
@ Test def verifyCommandLineExpression =
235
- assumeFalse(" Scripts do not yet support Scala 2 library TASTy" , Properties .usingScalaLibraryTasty)
236
228
printf(" ===> verify -e <expression> is properly handled by `dist/bin/scala`\n " )
237
229
val expected = " 9"
238
230
val expression = s " println(3*3) "
0 commit comments