Merge "examples/hello: Move hello to the test directory."
diff --git a/examples/hello/doc.go b/test/hello/doc.go
similarity index 100%
rename from examples/hello/doc.go
rename to test/hello/doc.go
diff --git a/examples/hello/hello_v23_test.go b/test/hello/hello_v23_test.go
similarity index 89%
rename from examples/hello/hello_v23_test.go
rename to test/hello/hello_v23_test.go
index 336fe5f..ffaa2c3 100644
--- a/examples/hello/hello_v23_test.go
+++ b/test/hello/hello_v23_test.go
@@ -59,8 +59,8 @@
if err != nil {
i.Fatalf("Could not create credentials: %v", err)
}
- clientbin := i.BuildGoPkg("v.io/x/ref/examples/hello/helloclient")
- serverbin := i.BuildGoPkg("v.io/x/ref/examples/hello/helloserver")
+ clientbin := i.BuildGoPkg("v.io/x/ref/test/hello/helloclient")
+ serverbin := i.BuildGoPkg("v.io/x/ref/test/hello/helloserver")
server := serverbin.WithStartOpts(opts).WithEnv(creds["helloserver"]).Start()
name := server.ExpectVar("SERVER_NAME")
if server.Failed() {
@@ -76,8 +76,8 @@
i.Fatalf("Could not create credentials: %v", err)
}
agentdbin := i.BuildGoPkg("v.io/x/ref/services/agent/agentd").WithStartOpts(opts)
- serverbin := i.BuildGoPkg("v.io/x/ref/examples/hello/helloserver")
- clientbin := i.BuildGoPkg("v.io/x/ref/examples/hello/helloclient")
+ serverbin := i.BuildGoPkg("v.io/x/ref/test/hello/helloserver")
+ clientbin := i.BuildGoPkg("v.io/x/ref/test/hello/helloclient")
server := agentdbin.WithEnv(creds["helloserver"]).Start(serverbin.Path())
name := server.ExpectVar("SERVER_NAME")
if server.Failed() {
@@ -94,8 +94,8 @@
}
agentdbin := i.BuildGoPkg("v.io/x/ref/services/agent/agentd").WithStartOpts(opts)
mounttabledbin := i.BuildGoPkg("v.io/x/ref/services/mounttable/mounttabled")
- serverbin := i.BuildGoPkg("v.io/x/ref/examples/hello/helloserver")
- clientbin := i.BuildGoPkg("v.io/x/ref/examples/hello/helloclient")
+ serverbin := i.BuildGoPkg("v.io/x/ref/test/hello/helloserver")
+ clientbin := i.BuildGoPkg("v.io/x/ref/test/hello/helloclient")
name := "hello"
mounttabled := agentdbin.WithEnv(creds["mounttabled"]).Start(mounttabledbin.Path(),
"--v23.tcp.address", "127.0.0.1:0")
@@ -123,8 +123,8 @@
agentdbin := i.BuildGoPkg("v.io/x/ref/services/agent/agentd").WithStartOpts(opts)
mounttabledbin := i.BuildGoPkg("v.io/x/ref/services/mounttable/mounttabled")
proxydbin := i.BuildGoPkg("v.io/x/ref/services/proxy/proxyd")
- serverbin := i.BuildGoPkg("v.io/x/ref/examples/hello/helloserver")
- clientbin := i.BuildGoPkg("v.io/x/ref/examples/hello/helloclient")
+ serverbin := i.BuildGoPkg("v.io/x/ref/test/hello/helloserver")
+ clientbin := i.BuildGoPkg("v.io/x/ref/test/hello/helloclient")
proxyname := "proxy"
name := "hello"
mounttabled := agentdbin.WithEnv(creds["mounttabled"]).Start(mounttabledbin.Path(),
diff --git a/examples/hello/helloclient/helloclient.go b/test/hello/helloclient/helloclient.go
similarity index 100%
rename from examples/hello/helloclient/helloclient.go
rename to test/hello/helloclient/helloclient.go
diff --git a/examples/hello/helloserver/helloserver.go b/test/hello/helloserver/helloserver.go
similarity index 100%
rename from examples/hello/helloserver/helloserver.go
rename to test/hello/helloserver/helloserver.go
diff --git a/examples/hello/v23_test.go b/test/hello/v23_test.go
similarity index 100%
rename from examples/hello/v23_test.go
rename to test/hello/v23_test.go
