Skip to content

Commit 2b8cd5a

Browse files
committed
Neg tests: change val computeFilePathsAndExpErrors to def
1 parent 92b6677 commit 2b8cd5a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

test/test/CompilerTest.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ abstract class CompilerTest {
113113
* with "-deep", all files in subdirectories (and so on) are included. */
114114
def compileDir(prefix: String, dirName: String, args: List[String] = Nil, runTest: Boolean = false)
115115
(implicit defaultOptions: List[String]): Unit = {
116-
val computeFilePathsAndExpErrors = { () =>
116+
def computeFilePathsAndExpErrors = {
117117
val dir = Directory(prefix + dirName)
118118
val (files, normArgs) = args match {
119119
case "-deep" :: args1 => (dir.deepFiles, args1)
@@ -126,7 +126,7 @@ abstract class CompilerTest {
126126
if (!generatePartestFiles || !partestableDir(prefix, dirName, args ++ defaultOptions)) {
127127
if (runTest)
128128
log(s"WARNING: run tests can only be run by partest, JUnit just verifies compilation: $prefix$dirName")
129-
val (filePaths, normArgs, expErrors) = computeFilePathsAndExpErrors()
129+
val (filePaths, normArgs, expErrors) = computeFilePathsAndExpErrors
130130
compileArgs(filePaths ++ normArgs, expErrors)
131131
} else {
132132
val (sourceDir, flags, deep) = args match {
@@ -139,7 +139,7 @@ abstract class CompilerTest {
139139
if (sourceDir.exists) {
140140
val firstDest = Directory(DPConfig.testRoot + JFile.separator + kind + JFile.separator + dirName)
141141
val xerrors = if (isNegTest(prefix)) {
142-
val (_, _, expErrors) = computeFilePathsAndExpErrors()
142+
val (_, _, expErrors) = computeFilePathsAndExpErrors
143143
expErrors.map(_.totalErrors).sum
144144
} else 0
145145
computeDestAndCopyFiles(sourceDir, firstDest, kind, flags, xerrors.toString)

0 commit comments

Comments
 (0)