internal/core/export: assign a name to TestSelfContained

For using a matrix to work properly, we need to have a name assigned to the test. Issue #3060 Signed-off-by: Marcel van Lohuizen <[email protected]> Change-Id: Iab9518a898b849366ba79321cc80bf3bf6a89e1c Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1194183 Unity-Result: CUE porcuepine <[email protected]> TryBot-Result: CUEcueckoo <[email protected]> Reviewed-by: Daniel Martí <[email protected]>
cue-lang · May 3, 2024 · 78e9e12 · 78e9e12
1 parent 9d3d545
commit 78e9e12
Show file tree

Hide file tree

Showing 18 changed files with 21 additions and 20 deletions.
diff --git a/internal/core/export/self_test.go b/internal/core/export/self_test.go
@@ -34,6 +34,7 @@ import (
 
 func TestSelfContained(t *testing.T) {
 	test := cuetxtar.TxTarTest{
+		Name: "self",
 		Root: "./testdata/selfcontained",
 	}
 

diff --git a/internal/core/export/testdata/main/issue2584.txtar b/internal/core/export/testdata/main/issue2584.txtar
@@ -8,7 +8,7 @@ F2: {
 }
 D: {}
 let L = D
--- out/default --
+-- out/self/default --
 -- out/definition --
 
 let L = D

diff --git a/internal/core/export/testdata/selfcontained/alias.txtar b/internal/core/export/testdata/selfcontained/alias.txtar
@@ -36,7 +36,7 @@ a: B=b: {
 }
 
 [NAME=string]: b: name: NAME
--- out/default --
+-- out/self/default --
 
 {
 	x: string

diff --git a/internal/core/export/testdata/selfcontained/alldef.txtar b/internal/core/export/testdata/selfcontained/alldef.txtar
@@ -9,7 +9,7 @@ is already a definition.
 }
 
 #a: b: c: #def
--- out/default --
+-- out/self/default --
 
 _#def
 _#def: {

diff --git a/internal/core/export/testdata/selfcontained/call.txtar b/internal/core/export/testdata/selfcontained/call.txtar
@@ -10,7 +10,7 @@ a: b: {
 	d: {}
 }
 
--- out/default --
+-- out/self/default --
 import "struct"
 
 // Do not inline `s`, as it makes calls less readable.

diff --git a/internal/core/export/testdata/selfcontained/def.txtar b/internal/core/export/testdata/selfcontained/def.txtar
@@ -5,7 +5,7 @@
 }
 
 a: b: c: #def
--- out/default --
+-- out/self/default --
 c: DEF.#x
 
 //cue:path: #def

diff --git a/internal/core/export/testdata/selfcontained/errors.txtar b/internal/core/export/testdata/selfcontained/errors.txtar
@@ -24,7 +24,7 @@ y: "b"
 z: string
 m: {}
 n: {foo: {baz: int}}
--- out/default --
+-- out/self/default --
 // comprehensions
 t1: {
 	for p in B let x = C if D {}

diff --git a/internal/core/export/testdata/selfcontained/import.txtar b/internal/core/export/testdata/selfcontained/import.txtar
@@ -48,7 +48,7 @@ w: {
 	}
 }
 
--- out/default --
+-- out/self/default --
 import (
 	"mod.test/a/pkg"
 	"tool/exec"
@@ -74,7 +74,7 @@ wa: pkg.w.a
 // Never expand builtin packages.
 run:     exec.Run
 _hidden: int
--- out/expand_imports --
+-- out/self/expand_imports --
 import "tool/exec"
 
 // Can be inlined.

diff --git a/internal/core/export/testdata/selfcontained/issue2247.txtar b/internal/core/export/testdata/selfcontained/issue2247.txtar
@@ -30,11 +30,11 @@ q: {
 
 r: {out: k: l: string}.out
 
--- out/default --
+-- out/self/default --
 import "example.com/t"
 
 f: t.p
--- out/expand_imports --
+-- out/self/expand_imports --
 f: {
 	c: [int]
 	d: [c][0]

diff --git a/internal/core/export/testdata/selfcontained/issue2247crash.txtar b/internal/core/export/testdata/selfcontained/issue2247crash.txtar
@@ -2,6 +2,6 @@
 -- x.cue --
 a: _
 b: [a][0]
--- out/default --
+-- out/self/default --
 a: _
 b: [a][0]
diff --git a/internal/core/export/testdata/selfcontained/issue2247index.txtar b/internal/core/export/testdata/selfcontained/issue2247index.txtar
@@ -11,7 +11,7 @@ root: {
 a: [{
 	s: t: string
 }]
--- out/default --
+-- out/self/default --
 b:      Index0_1
 c:      Index0_1
 Index0: int

diff --git a/internal/core/export/testdata/selfcontained/issue867.txtar b/internal/core/export/testdata/selfcontained/issue867.txtar
@@ -2,7 +2,7 @@
 -- in.cue --
 t: {name: string}
 output: [...t]
--- out/default --
+-- out/self/default --
 
 [...{
 	name: string

diff --git a/internal/core/export/testdata/selfcontained/nochange.txtar b/internal/core/export/testdata/selfcontained/nochange.txtar
@@ -7,6 +7,6 @@ a: b: {
 -- out/selfcontained --
 c: 1
 d: 2
--- out/default --
+-- out/self/default --
 c: 1
 d: 2
diff --git a/internal/core/export/testdata/selfcontained/ref.txtar b/internal/core/export/testdata/selfcontained/ref.txtar
@@ -24,7 +24,7 @@ a: b: {
 
 	ref6: y.z.map[incomplete2] // inline the single-use map.
 }
--- out/default --
+-- out/self/default --
 ref1: MAP
 ref2: MAP.foo
 ref3: MAP[INCOMPLETE1]

diff --git a/internal/core/export/testdata/selfcontained/rootimport.txtar b/internal/core/export/testdata/selfcontained/rootimport.txtar
@@ -20,14 +20,14 @@ v: {
 	b: a
 }
 
--- out/default --
+-- out/self/default --
 import "mod.test/a/pkg"
 
 a: pkg
 
 // Force no inline.
 b: pkg.v.a
--- out/expand_imports --
+-- out/self/expand_imports --
 a: PKG
 
 // Force no inline.

diff --git a/internal/core/export/testdata/selfcontained/selfcontained.txtar b/internal/core/export/testdata/selfcontained/selfcontained.txtar
@@ -38,7 +38,7 @@ a: b: {
 	s: string
 	t: b.s
 }
--- out/default --
+-- out/self/default --
 c: "out"
 // TODO: should most likely resolve to "out", not c, because b points to
 // outside the exported value

diff --git a/internal/core/export/testdata/selfcontained/simplifyexpr.txtar b/internal/core/export/testdata/selfcontained/simplifyexpr.txtar
@@ -10,7 +10,7 @@ a: b: {
 	d: {}
 }
 
--- out/default --
+-- out/self/default --
 import "struct"
 
 c: struct.MaxFields(S, 3)

diff --git a/internal/core/export/testdata/selfcontained/splitcomprehension.txtar b/internal/core/export/testdata/selfcontained/splitcomprehension.txtar
@@ -20,7 +20,7 @@ a: {
 	}
 	b: {}
 }
--- out/default --
+-- out/self/default --
 
 {
 	k2: "test"