internal/cuetxtar: support matrix name skips like #skip-v2

cue/testdata/readme.md suggests that #skip-{name} options are supported
as well as a global #skip at the top of a testscript.
Indeed #skip works just fine, but for example #skip-v2 does not,
because it is simply not implemented in cuetxtar itself.

Implement generic support for #skip-{name} in cuetxtar when running
via a test matrix. This allows removing the same implementations from
encoding/openapi and tools/trim, as they can rely on cuetxtar now.

internal/core/adt is slightly different; it uses top-level
TestEvalV2 and TestEvalV3 tests rather than a test matrix.
Don't refactor that right now as it would cause lots of churn,
but instead add a workaround to support #skip-v2 for TestEvalV2,
which is necessary for regression tests where evalv2 panics or hangs.
Leave a TODO as a reminder to clean this up in the future.

For #2526.

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

Author: mvdan

encoding/openapi/openapi_test.go

@@ -68,10 +68,6 @@ func TestGenerateOpenAPI(t *testing.T) {
 	}
 
 	test.Run(t, func(t *cuetxtar.Test) {
-		if t.HasTag("skip-" + t.Name()) {
-			t.Skip()
-		}
-
 		a := t.Instance()
 		ctx := t.CueContext()
 		v := ctx.BuildInstance(a)

internal/cuetxtar/txtar.go

@@ -98,6 +98,7 @@ type TxTarTest struct {
 // A txtar file can define test-specific tags and values in the comment section.
 // These are available via the [Test.HasTag] and [Test.Value] methods.
 // The #skip tag causes a [Test] to be skipped.
+// When running via [cuetdtest.Matrix], #skip-[cuetdtest.M.Name] tags can also be used.
 // The #noformat tag causes the $CUE_FORMAT_TXTAR value
 // to be ignored.
 //
@@ -459,7 +460,16 @@ func (x *TxTarTest) run(t *testing.T, m *cuetdtest.M, f func(tc *Test)) {
 			if tc.HasTag("skip") {
 				t.Skip()
 			}
-
+			if tc.M != nil {
+				// When running via [cuetdtest.Matrix], support e.g. #skip-v2.
+				if tc.HasTag("skip-" + tc.Name()) {
+					t.Skip()
+				}
+			} else if tc.HasTag("skip-v2") && strings.Contains(t.Name(), "EvalV2") {
+				// Temporary hack since internal/core/adt uses TestEvalV2 rather than [cuetdtest.Matrix].
+				// TODO(mvdan): clean this up.
+				t.Skip()
+			}
 			if msg, ok := x.Skip[testName]; ok {
 				t.Skip(msg)
 			}

tools/trim/trim_test.go

@@ -40,9 +40,6 @@ func TestTrimFiles(t *testing.T) {
 	}
 
 	test.Run(t, func(t *cuetxtar.Test) {
-		if t.HasTag("skip-" + t.Name()) {
-			t.Skip()
-		}
 		a := t.Instance()
 		ctx := t.CueContext()
 		val := ctx.BuildInstance(a)