Re-enable collection-strawman tests

allanrenucci · allanrenucci · commit 1c0bb601bcae · 2018-06-25T17:24:59.000+02:00
diff --git a/.gitmodules b/.gitmodules
@@ -8,5 +8,5 @@
 	branch = dotty-library2.12
 [submodule "collection-strawman"]
 	path = collection-strawman
-	url = https://github.com/scala/collection-strawman.git
-	branch = master
+	url = https://github.com/dotty-staging/collection-strawman.git
+	branch = dotty
diff --git a/collection-strawman b/collection-strawman
@@ -1 +1 @@
-Subproject commit abd20a60f730ef478551ee68ed4326f8bf582dd8
+Subproject commit 58fd6b002889d071e12223c403cdf8d82b43c298
diff --git a/compiler/test/dotty/tools/dotc/IdempotencyTests.scala b/compiler/test/dotty/tools/dotc/IdempotencyTests.scala
@@ -64,14 +64,12 @@ class IdempotencyTests extends ParallelTesting {
     }
     val allChecks = {
       check("CheckOrderIdempotency") +
-      // Disabled until strawman is fixed
-      // check("CheckStrawmanIdempotency") +
+      check("CheckStrawmanIdempotency") +
       check("CheckPosIdempotency")
     }
 
     val allTests = {
-      // Disabled until strawman is fixed
-      // strawmanIdempotency +
+      strawmanIdempotency +
       orderIdempotency +
       posIdempotency
     }
diff --git a/compiler/test/dotty/tools/dotc/LinkTests.scala b/compiler/test/dotty/tools/dotc/LinkTests.scala
@@ -27,7 +27,7 @@ class LinkTests extends ParallelTesting {
 
 
   // Disabled until strawman is fixed
-  // @Test
+  @Test
   def linkTest: Unit = {
     // Setup and compile libraries
     val strawmanLibGroup = TestGroup("linkTest/strawmanLibrary")

Original file line number	Diff line number	Diff line change
`@@ -64,14 +64,12 @@ class IdempotencyTests extends ParallelTesting {`
`64`	`64`	`}`
`65`	`65`	`val allChecks = {`
`66`	`66`	`check("CheckOrderIdempotency") +`
`67`		`- // Disabled until strawman is fixed`
`68`		`- // check("CheckStrawmanIdempotency") +`
	`67`	`+ check("CheckStrawmanIdempotency") +`
`69`	`68`	`check("CheckPosIdempotency")`
`70`	`69`	`}`
`71`	`70`
`72`	`71`	`val allTests = {`
`73`		`- // Disabled until strawman is fixed`
`74`		`- // strawmanIdempotency +`
	`72`	`+ strawmanIdempotency +`
`75`	`73`	`orderIdempotency +`
`76`	`74`	`posIdempotency`
`77`	`75`	`}`