TBR mojo/v23proxy: Restore v23proxy integration test
This should allow the integration test to run again.
These changes are minor, so TBR is fine. I want to check the flake level.
Change-Id: I76573c307f53363163cb252246e75b0b5db1a404
diff --git a/go/src/v.io/x/mojo/tests/util/mojo_shell_runner.go b/go/src/v.io/x/mojo/tests/util/mojo_shell_runner.go
index b2908ee..f8fa6b7 100644
--- a/go/src/v.io/x/mojo/tests/util/mojo_shell_runner.go
+++ b/go/src/v.io/x/mojo/tests/util/mojo_shell_runner.go
@@ -81,7 +81,7 @@
func mojoProfileName() string {
if val, ok := os.LookupEnv("USE_MOJO_DEV_PROFILE"); ok && val == "true" {
fmt.Printf("Using dev profile\n")
- return "mojo-dev"
+ return "v23:mojo-dev"
}
- return "mojo"
+ return "v23:mojo"
}
diff --git a/go/src/v.io/x/mojo/transcoder/internal/internal.vdl.go b/go/src/v.io/x/mojo/transcoder/internal/internal.vdl.go
index ae3c6a8..75ae23b 100644
--- a/go/src/v.io/x/mojo/transcoder/internal/internal.vdl.go
+++ b/go/src/v.io/x/mojo/transcoder/internal/internal.vdl.go
@@ -879,6 +879,25 @@
return nil
}
+// Create zero values for each type.
+var (
+ __VDLZeroAddressInfo = AddressInfo{}
+ __VDLZeroCreditAgency = CreditAgencyEquifax
+ __VDLZeroExperianRating = ExperianRatingGood
+ __VDLZeroEquifaxCreditReport = EquifaxCreditReport{}
+ __VDLZeroExperianCreditReport = ExperianCreditReport{}
+ __VDLZeroTransUnionCreditReport = TransUnionCreditReport{}
+ __VDLZeroAgencyReport = AgencyReport(AgencyReportEquifaxReport{})
+ __VDLZeroCreditReport = CreditReport{
+ Report: AgencyReportEquifaxReport{},
+ }
+ __VDLZeroCustomer = Customer{
+ Credit: CreditReport{
+ Report: AgencyReportEquifaxReport{},
+ },
+ }
+)
+
var __VDLInitCalled bool
// __VDLInit performs vdl initialization. It is safe to call multiple times.
diff --git a/go/src/v.io/x/mojo/transcoder/testtypes/testtypes.vdl.go b/go/src/v.io/x/mojo/transcoder/testtypes/testtypes.vdl.go
index cd71ff0..9627c71 100644
--- a/go/src/v.io/x/mojo/transcoder/testtypes/testtypes.vdl.go
+++ b/go/src/v.io/x/mojo/transcoder/testtypes/testtypes.vdl.go
@@ -1340,7 +1340,7 @@
fInt32Target vdl.Int32Target
fRectTarget RectTarget
fStringTarget vdl.StringTarget
- fArrayTarget unnamed_5b5d696e7438Target
+ fArrayTarget __VDLTarget1_list
fBoolTarget vdl.BoolTarget
fInt16Target vdl.Int16Target
vdl.TargetBase
@@ -1393,14 +1393,14 @@
}
// []int8
-type unnamed_5b5d696e7438Target struct {
+type __VDLTarget1_list struct {
Value *[]int8
elemTarget vdl.Int8Target
vdl.TargetBase
vdl.ListTargetBase
}
-func (t *unnamed_5b5d696e7438Target) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
+func (t *__VDLTarget1_list) StartList(tt *vdl.Type, len int) (vdl.ListTarget, error) {
if ttWant := vdl.TypeOf((*[]int8)(nil)); !vdl.Compatible(tt, ttWant) {
return nil, fmt.Errorf("type %v incompatible with %v", tt, ttWant)
@@ -1412,15 +1412,15 @@
}
return t, nil
}
-func (t *unnamed_5b5d696e7438Target) StartElem(index int) (elem vdl.Target, _ error) {
+func (t *__VDLTarget1_list) StartElem(index int) (elem vdl.Target, _ error) {
t.elemTarget.Value = &(*t.Value)[index]
target, err := &t.elemTarget, error(nil)
return target, err
}
-func (t *unnamed_5b5d696e7438Target) FinishElem(elem vdl.Target) error {
+func (t *__VDLTarget1_list) FinishElem(elem vdl.Target) error {
return nil
}
-func (t *unnamed_5b5d696e7438Target) FinishList(elem vdl.ListTarget) error {
+func (t *__VDLTarget1_list) FinishList(elem vdl.ListTarget) error {
return nil
}
@@ -1531,6 +1531,23 @@
return nil
}
+// Create zero values for each type.
+var (
+ __VDLZeroAnEnum = AnEnumFirst
+ __VDLZeroPodUnion = PodUnion(PodUnionFInt8{})
+ __VDLZeroPodUnionWrapper = PodUnionWrapper{
+ PodUnion: PodUnionFInt8{},
+ }
+ __VDLZeroDummyStruct = DummyStruct{}
+ __VDLZeroObjectUnion = ObjectUnion(ObjectUnionFInt8{})
+ __VDLZeroObjectUnionWrapper = ObjectUnionWrapper{
+ ObjectUnion: ObjectUnionFInt8{},
+ }
+ __VDLZeroRect = Rect{}
+ __VDLZeroMultiVersionStruct = MultiVersionStruct{}
+ __VDLZeroMultiVersionStructV3 = MultiVersionStructV3{}
+)
+
var __VDLInitCalled bool
// __VDLInit performs vdl initialization. It is safe to call multiple times.
diff --git a/pubspec.yaml b/pubspec.yaml
index b9eadff..5169f6a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -4,7 +4,7 @@
name: v23proxy
version: 0.0.1
dependencies:
- mojo_sdk: 0.2.16
+ mojo_sdk: 0.2.19
dev_dependencies:
dart_style: any
test: any