Skip to content

Commit 3c33345

Browse files
committed
Make new setting tests deterministic
1 parent d9d7658 commit 3c33345

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

community-build/src/scala/dotty/communitybuild/projects.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ object projects:
503503
project = "verify",
504504
sbtTestCommand = "verifyJVM/test",
505505
sbtDocCommand = "verifyJVM/doc",
506-
scalacOptions = SbtCommunityProject.scalacOptions.filter(flag => flag != "-Xcheck-macros" && flag != "-Xlint") // TODO enable -Xcheck-macros, wrong flag -Xlint
506+
scalacOptions = SbtCommunityProject.scalacOptions.filter(flag => flag != "-Xcheck-macros") // TODO enable -Xcheck-macros
507507
)
508508

509509
lazy val discipline = SbtCommunityProject(

compiler/test/dotty/tools/dotc/SettingsTests.scala

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -212,13 +212,13 @@ class SettingsTests {
212212

213213
import Settings._
214214

215-
val creationTime = Files.getLastModifiedTime(file)
215+
Files.write(file, "test".getBytes())
216+
val fileStateBefore = String(Files.readAllBytes(file))
217+
216218
val args = List(s"-testOutput:${file.toString}")
217219
val summary = processArguments(args, processAll = true)
218220

219-
val creationTimeAfterProcessing = Files.getLastModifiedTime(file)
220-
221-
assert(creationTimeAfterProcessing.toMillis > creationTime.toMillis, "Jar should have been overriden")
221+
assertNotEquals(fileStateBefore, String(Files.readAllBytes(file)), "Jar should have been overriden")
222222

223223
}(Files.deleteIfExists(_))
224224

@@ -257,13 +257,13 @@ class SettingsTests {
257257

258258
import Settings._
259259

260-
val creationTime = Files.getLastModifiedTime(file)
260+
Files.write(file, "test".getBytes())
261+
val fileStateBefore = String(Files.readAllBytes(file))
262+
261263
val args = List(s"-testOutput:${file.toString}")
262264
val summary = processArguments(args, processAll = true)
263265

264-
val creationTimeAfterProcessing = Files.getLastModifiedTime(file)
265-
266-
assertEquals(creationTimeAfterProcessing, creationTime)
266+
assertEquals(fileStateBefore, String(Files.readAllBytes(file)))
267267

268268
}(Files.deleteIfExists(_))
269269

0 commit comments

Comments
 (0)