veyron/lib/modules/core: Remove reliance on rt.R().
Change-Id: I689e6bf794010c791b9db7cc1d2c4632862c5013
diff --git a/tools/naming/simulator/driver.go b/tools/naming/simulator/driver.go
index 410877d..32e9ff9 100644
--- a/tools/naming/simulator/driver.go
+++ b/tools/naming/simulator/driver.go
@@ -16,6 +16,7 @@
"time"
"unicode"
+ "veyron.io/veyron/veyron2"
"veyron.io/veyron/veyron2/rt"
"veyron.io/veyron/veyron/lib/expect"
@@ -94,8 +95,14 @@
}
}
+var runtime veyron2.Runtime
+
func main() {
- rt.Init()
+ var err error
+ if runtime, err = rt.New(); err != nil {
+ panic(err)
+ }
+ defer runtime.Cleanup()
// Subprocesses commands are run by fork/execing this binary
// so we must test to see if this instance is a subprocess or the
