Skip to content

Commit 54d4459

Browse files
committed
Merge remote-tracking branch 'origin/main' into fix/run-compiler-tests-in-parallel
2 parents 1ba6f9c + d428e45 commit 54d4459

2 files changed

Lines changed: 3 additions & 17 deletions

File tree

src/org/rascalmpl/compiler/lang/rascalcore/check/tests/ChangeScenarioTests.rsc

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -469,21 +469,7 @@ test bool breakingChange1(){
469469
return expectReChecks(D, ["C", "D"]);
470470
}
471471

472-
test bool timestampsIncrease() {
473-
datetime lastTime = $2020-01-01T00:00:00.000+00:00$;
474-
loc testLoc = |memory:///test-random-write-file|;
475-
for (i <- [0..10000]) {
476-
writeFile(testLoc, "Hoi");
477-
datetime newTime = lastModified(testLoc);
478-
if (lastTime == newTime) {
479-
println("Time did not change: <lastTime> == <newTime>");
480-
return false;
481-
}
482-
}
483-
return true;
484-
}
485-
486-
test bool fixedErrorsDisappear2() { // ht @toinehartman
472+
test bool fixedErrorsDisappearCompact() {
487473
clearMemory();
488474
pcfg = getDefaultTestingPathConfig();
489475

@@ -896,4 +882,4 @@ void allBenchmarks(){
896882
mediumBenchmarkRechecking();
897883
//largeBenchmarkRechecking();
898884
println("Total time: <(cpuTime() - beginTime)/1000000> ms");
899-
}
885+
}

src/org/rascalmpl/compiler/lang/rascalcore/check/tests/StaticTestingUtils.rsc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,4 +572,4 @@ bool expectReChecksWithErrors(loc mloc, list[str] moduleNames, PathConfig pathCo
572572
msgs = [ "Checked <nm>" | nm <- moduleNames ];
573573
mlocs = mloc + [ getModuleLocation(mn, pathConfig) | mn <- moduleNames ];
574574
return checkModuleAndFilter(mlocs, msgs, matchAll=true, errorsAllowed=true, pathConfig=pathConfig);
575-
}
575+
}

0 commit comments

Comments
 (0)