Skip to content

Commit a78b158

Browse files
committed
cmd/cue: prepare testscripts for evalv3 being on by default
A few tests covered both evalv2 and evalv3, but in a way that assumed the default being evalv2, so make sure they explicitly disable and then enable evalv3. Two `cmd cue` tests fail on evalv3, which suggests there are bugs to be figured out; disable them and leave TODOs. `cue exp gengotypes` sadly panics on evalv3. Disable it with a TODO, and we will file an issue for that shortly given its severity. For #3662. Signed-off-by: Daniel Martí <[email protected]> Change-Id: Ic18ffb815ab67e4b265200cd18ca7c19bf06ae64 Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1211973 TryBot-Result: CUEcueckoo <[email protected]> Reviewed-by: Marcel van Lohuizen <[email protected]>
1 parent dbed3d2 commit a78b158

File tree

5 files changed

+13
-4
lines changed

5 files changed

+13
-4
lines changed

cmd/cue/cmd/testdata/script/cmd_issue2060.txtar

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
exec cue cmd tangle_sublime
2-
cmp stdout stdout1.golden
1+
# TODO(evalv3): make this test work on evalv3
2+
# exec cue cmd tangle_sublime
3+
# cmp stdout stdout1.golden
34

45
exec cue cmd ts
56
cmp stdout stdout2.golden

cmd/cue/cmd/testdata/script/cmd_undefined.txtar

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
skip 'TODO(evalv3): make this test work on evalv3'
2+
13
! exec cue cmd tool
24
stderr 'command.tool.bad: undefined field: DoesntExist'
35

cmd/cue/cmd/testdata/script/eval_issue3376.txtar

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
#
1111
# The new evaluator correctly results in no errors in these cases.
1212

13+
env CUE_EXPERIMENT=evalv3=0
14+
1315
# evalv2 - scenario 1
1416
exec cue eval ./scenario1.cue
1517

@@ -28,7 +30,7 @@ exec cue eval ./scenario3.cue
2830
! exec cue eval ./scenario4.cue
2931
stderr 'items.a: cannot add to field '
3032

31-
env CUE_EXPERIMENT=evalv3
33+
env CUE_EXPERIMENT=evalv3=1
3234

3335
# evalv3 - scenario 1
3436
exec cue eval ./scenario1.cue

cmd/cue/cmd/testdata/script/exp_gengotypes.txtar

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
skip 'TODO(evalv3): make this test work, and not panic, on evalv3'
2+
13
exec cue exp gengotypes ./root
24
! stderr .
35

cmd/cue/cmd/testdata/script/vet_issue2704.txtar

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
# https://cuelang.org/issues/2704
22

3+
env CUE_EXPERIMENT=evalv3=0
4+
35
! exec cue export schema.cue data.json
46
cmp stderr evalv2-stderr.golden
57
! exec cue vet schema.cue data.json
68
cmp stderr evalv2-stderr.golden
79

810
# This issue is already fixed in the new evaluator.
9-
env CUE_EXPERIMENT=evalv3
11+
env CUE_EXPERIMENT=evalv3=1
1012

1113
exec cue export schema.cue data.json
1214
cmp stdout evalv3-stdout.golden

0 commit comments

Comments
 (0)