Merge pull request #5199 from milessabin/topic/flip-message

nicolasstucki · web-flow · commit 3b7322fd05e1 · 2018-10-08T07:47:34.000+02:00
Flip messages for neg test pass/fail
diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala
@@ -984,10 +984,10 @@ trait ParallelTesting extends RunnerOrchestration { self =>
 
       cleanup()
 
-      if (!shouldFail && test.didFail) {
+      if (shouldFail && !test.didFail) {
         fail(s"Neg test shouldn't have failed, but did. Reasons:\n${ reasonsForFailure(test) }")
       }
-      else if (shouldFail && !test.didFail) {
+      else if (!shouldFail && test.didFail) {
         fail("Neg test should have failed, but did not")
       }
 

Original file line number	Diff line number	Diff line change
`@@ -984,10 +984,10 @@ trait ParallelTesting extends RunnerOrchestration { self =>`
`984`	`984`
`985`	`985`	`cleanup()`
`986`	`986`
`987`		`- if (!shouldFail && test.didFail) {`
	`987`	`+ if (shouldFail && !test.didFail) {`
`988`	`988`	`fail(s"Neg test shouldn't have failed, but did. Reasons:\n${ reasonsForFailure(test) }")`
`989`	`989`	`}`
`990`		`- else if (shouldFail && !test.didFail) {`
	`990`	`+ else if (!shouldFail && test.didFail) {`
`991`	`991`	`fail("Neg test should have failed, but did not")`
`992`	`992`	`}`
`993`	`993`