all: clean up a number of txtar test skips

Move compile/erralias.txtar and cycle/patterns.txtar from Go maps
to #skip tags at the top of the txtar, which is more consistent
with the other tests and makes the git history a bit nicer
given that any changes are clearly tied to each file.

internal/core/compile's skip on "fulleval/031_comparison against bottom"
seems to have been a no-op for a long time due to the use of spaces.

Finally, remove any remaining empty maps.

Signed-off-by: Daniel Martí <[email protected]>
Change-Id: Iaa33ed9a27ba754b540e9d287981ad089a3ab016
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1214551
TryBot-Result: CUEcueckoo <[email protected]>
Unity-Result: CUE porcuepine <[email protected]>
Reviewed-by: Matthew Sackman <[email protected]>

Author: mvdan

cue/testdata/compile/erralias.txtar

@@ -1,3 +1,5 @@
+// Causes a stack overflow on evalv2 and evalv3.
+#skip
 -- in.cue --
  let X = {}
 

cue/testdata/cycle/patterns.txtar

@@ -1,5 +1,6 @@
 // Excluded from V2, which no longer passes.
-Lots of cycle-reference goodness.
+#skip-v2
+// Lots of cycle-reference goodness.
 
 -- in.cue --
 [!~"^[.]"]: c

internal/core/adt/eval_test.go

@@ -49,8 +49,6 @@ func TestEvalV2(t *testing.T) {
 	test := cuetxtar.TxTarTest{
 		Root: "../../../cue/testdata",
 		Name: "eval",
-		Skip: alwaysSkip,
-		ToDo: needFix,
 	}
 
 	cuedebug.Init()
@@ -65,15 +63,6 @@ func TestEvalV2(t *testing.T) {
 	})
 }
 
-var alwaysSkip = map[string]string{
-	"compile/erralias": "compile error",
-}
-
-var needFix = map[string]string{
-	"DIR/NAME":       "reason",
-	"cycle/patterns": "cycle detection in v2",
-}
-
 func TestEvalV3(t *testing.T) {
 	// TODO: remove use of externalDeps for processing. Currently, enabling
 	// this would fix some issues, but also introduce some closedness bugs.
@@ -86,14 +75,10 @@ func TestEvalV3(t *testing.T) {
 	cuedebug.Init()
 	flags := cuedebug.Flags
 
-	var todoAlpha = map[string]string{}
-
 	test := cuetxtar.TxTarTest{
 		Root:     "../../../cue/testdata",
 		Name:     "evalalpha",
 		Fallback: "eval", // Allow eval golden files to pass these tests.
-		Skip:     alwaysSkip,
-		ToDo:     todoAlpha,
 	}
 
 	if *todo {
@@ -112,8 +97,8 @@ func TestEvalV3(t *testing.T) {
 		errorCount += runEvalTest(t, internal.EvalV3, flags)
 	})
 
-	t.Logf("todo: %d, ran: %d, skipped: %d, nodeErrors: %d",
-		len(todoAlpha), ran, skipped, errorCount)
+	t.Logf("ran: %d, skipped: %d, nodeErrors: %d",
+		ran, skipped, errorCount)
 }
 
 // skipFiles returns true if the given files contain CUE that is not yet handled

internal/core/compile/compile_test.go

@@ -36,8 +36,6 @@ func TestCompile(t *testing.T) {
 	test := cuetxtar.TxTarTest{
 		Root: "../../../cue/testdata/",
 		Name: "compile",
-		Skip: alwaysSkip,
-		ToDo: needFix,
 	}
 
 	if *todo {
@@ -72,14 +70,6 @@ func TestCompile(t *testing.T) {
 	})
 }
 
-var alwaysSkip = map[string]string{
-	"fulleval/031_comparison against bottom": "fix bin op binding in test",
-}
-
-var needFix = map[string]string{
-	"DIR/NAME": "explanation",
-}
-
 // TestX is for debugging. Do not delete.
 func TestX(t *testing.T) {
 	in := `