sensorlog_lite: Fix test boilerplate for test.Init() removal.
Change-Id: I285940f4427da5f164c2363bcf8e019b18c3863d
diff --git a/go/src/v.io/x/sensorlog/Makefile b/go/src/v.io/x/sensorlog/Makefile
index 1585537..d880055 100644
--- a/go/src/v.io/x/sensorlog/Makefile
+++ b/go/src/v.io/x/sensorlog/Makefile
@@ -25,4 +25,6 @@
.PHONY: test
test:
- jiri go test v.io/x/sensorlog_lite/... -v23.tests
+ jiri go test v.io/x/sensorlog_lite/...
+ # TODO(ivanpi): Add jiri command to run integration tests.
+ jiri go test v.io/x/sensorlog_lite/internal/client -run=TestV23* -v23.tests
diff --git a/go/src/v.io/x/sensorlog/internal/client/v23_test.go b/go/src/v.io/x/sensorlog/internal/client/v23_test.go
index 4e4a1e3..d826a88 100644
--- a/go/src/v.io/x/sensorlog/internal/client/v23_test.go
+++ b/go/src/v.io/x/sensorlog/internal/client/v23_test.go
@@ -11,13 +11,11 @@
"os"
"testing"
- "v.io/x/ref/test"
"v.io/x/ref/test/modules"
"v.io/x/ref/test/v23tests"
)
func TestMain(m *testing.M) {
- test.Init()
modules.DispatchAndExitIfChild()
cleanup := v23tests.UseSharedBinDir()
r := m.Run()
diff --git a/go/src/v.io/x/sensorlog/internal/measure/runloop/v23_internal_test.go b/go/src/v.io/x/sensorlog/internal/measure/runloop/v23_internal_test.go
deleted file mode 100644
index 41c132f..0000000
--- a/go/src/v.io/x/sensorlog/internal/measure/runloop/v23_internal_test.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015 The Vanadium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file was auto-generated via go generate.
-// DO NOT UPDATE MANUALLY
-
-package runloop
-
-import (
- "os"
- "testing"
-
- "v.io/x/ref/test"
-)
-
-func TestMain(m *testing.M) {
- test.Init()
- os.Exit(m.Run())
-}
diff --git a/go/src/v.io/x/sensorlog/internal/measure/sampler/v23_internal_test.go b/go/src/v.io/x/sensorlog/internal/measure/sampler/v23_internal_test.go
deleted file mode 100644
index e9ce332..0000000
--- a/go/src/v.io/x/sensorlog/internal/measure/sampler/v23_internal_test.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015 The Vanadium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file was auto-generated via go generate.
-// DO NOT UPDATE MANUALLY
-
-package sampler
-
-import (
- "os"
- "testing"
-
- "v.io/x/ref/test"
-)
-
-func TestMain(m *testing.M) {
- test.Init()
- os.Exit(m.Run())
-}
diff --git a/go/src/v.io/x/sensorlog/internal/measure/v23_test.go b/go/src/v.io/x/sensorlog/internal/measure/v23_test.go
deleted file mode 100644
index 39be64c..0000000
--- a/go/src/v.io/x/sensorlog/internal/measure/v23_test.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2015 The Vanadium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file was auto-generated via go generate.
-// DO NOT UPDATE MANUALLY
-
-package measure_test
-
-import (
- "os"
- "testing"
-
- "v.io/x/ref/test"
- "v.io/x/ref/test/modules"
-)
-
-func TestMain(m *testing.M) {
- test.Init()
- modules.DispatchAndExitIfChild()
- os.Exit(m.Run())
-}
diff --git a/go/src/v.io/x/sensorlog/internal/sbmodel/v23_internal_test.go b/go/src/v.io/x/sensorlog/internal/sbmodel/v23_internal_test.go
deleted file mode 100644
index 75e5947..0000000
--- a/go/src/v.io/x/sensorlog/internal/sbmodel/v23_internal_test.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015 The Vanadium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file was auto-generated via go generate.
-// DO NOT UPDATE MANUALLY
-
-package sbmodel
-
-import (
- "os"
- "testing"
-
- "v.io/x/ref/test"
-)
-
-func TestMain(m *testing.M) {
- test.Init()
- os.Exit(m.Run())
-}
diff --git a/go/src/v.io/x/sensorlog/internal/sbutil/v23_test.go b/go/src/v.io/x/sensorlog/internal/sbutil/v23_test.go
deleted file mode 100644
index d8131c0..0000000
--- a/go/src/v.io/x/sensorlog/internal/sbutil/v23_test.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2015 The Vanadium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file was auto-generated via go generate.
-// DO NOT UPDATE MANUALLY
-
-package sbutil_test
-
-import (
- "os"
- "testing"
-
- "v.io/x/ref/test"
- "v.io/x/ref/test/modules"
-)
-
-func TestMain(m *testing.M) {
- test.Init()
- modules.DispatchAndExitIfChild()
- os.Exit(m.Run())
-}
diff --git a/go/src/v.io/x/sensorlog/internal/util/v23_internal_test.go b/go/src/v.io/x/sensorlog/internal/util/v23_internal_test.go
deleted file mode 100644
index 5755e64..0000000
--- a/go/src/v.io/x/sensorlog/internal/util/v23_internal_test.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015 The Vanadium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file was auto-generated via go generate.
-// DO NOT UPDATE MANUALLY
-
-package util
-
-import (
- "os"
- "testing"
-
- "v.io/x/ref/test"
-)
-
-func TestMain(m *testing.M) {
- test.Init()
- os.Exit(m.Run())
-}
