diff --git a/internal/core/export/self_test.go b/internal/core/export/self_test.go index 488d43069..55b06a9a0 100644 --- 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 index 143238733..8e66d0b55 100644 --- 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 index 8ed3305f5..863eca1e1 100644 --- 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 index a97a29b77..329751c08 100644 --- 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 index 432334579..ac74564c8 100644 --- 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 index 52a58d0b3..beb85dceb 100644 --- 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 index 6e3a8ba7d..5fde114e4 100644 --- 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 index fc261cd1c..6485c6dc4 100644 --- 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 index a176fde8d..a48ef5da2 100644 --- 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 index 54f2ae8d5..26b86b319 100644 --- 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 index 67b9c7522..c8d37c0c3 100644 --- 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 index 90ebb641f..80e7549ce 100644 --- 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 index 486eb2385..34de7e8e7 100644 --- 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 index 913f911f1..3f8fcae8d 100644 --- 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 index 8c1071ae5..810579b35 100644 --- 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 index c4d822eb8..6b32f7ab7 100644 --- 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 index d9e69564d..7677a51c8 100644 --- 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 index b9b8433c7..a2dd6ad8d 100644 --- 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"