Reorganization of VANADIUM_ROOT relative paths.
diff --git a/tools/debug/impl.go b/tools/debug/impl.go
index 0e364f3..4965531 100644
--- a/tools/debug/impl.go
+++ b/tools/debug/impl.go
@@ -12,22 +12,22 @@
"time"
"v.io/lib/cmdline"
- "v.io/veyron/veyron/lib/glob"
- "v.io/veyron/veyron/lib/signals"
- "v.io/veyron/veyron/services/mgmt/pprof/client"
- istats "v.io/veyron/veyron/services/mgmt/stats"
- "v.io/veyron/veyron2/context"
- "v.io/veyron/veyron2/naming"
- "v.io/veyron/veyron2/services/mgmt/logreader"
- logtypes "v.io/veyron/veyron2/services/mgmt/logreader/types"
- "v.io/veyron/veyron2/services/mgmt/pprof"
- "v.io/veyron/veyron2/services/mgmt/stats"
- vtracesvc "v.io/veyron/veyron2/services/mgmt/vtrace"
- "v.io/veyron/veyron2/services/watch"
- watchtypes "v.io/veyron/veyron2/services/watch/types"
- "v.io/veyron/veyron2/uniqueid"
- "v.io/veyron/veyron2/vdl/vdlutil"
- "v.io/veyron/veyron2/vtrace"
+ "v.io/core/veyron/lib/glob"
+ "v.io/core/veyron/lib/signals"
+ "v.io/core/veyron/services/mgmt/pprof/client"
+ istats "v.io/core/veyron/services/mgmt/stats"
+ "v.io/core/veyron2/context"
+ "v.io/core/veyron2/naming"
+ "v.io/core/veyron2/services/mgmt/logreader"
+ logtypes "v.io/core/veyron2/services/mgmt/logreader/types"
+ "v.io/core/veyron2/services/mgmt/pprof"
+ "v.io/core/veyron2/services/mgmt/stats"
+ vtracesvc "v.io/core/veyron2/services/mgmt/vtrace"
+ "v.io/core/veyron2/services/watch"
+ watchtypes "v.io/core/veyron2/services/watch/types"
+ "v.io/core/veyron2/uniqueid"
+ "v.io/core/veyron2/vdl/vdlutil"
+ "v.io/core/veyron2/vtrace"
)
var (
diff --git a/tools/debug/main.go b/tools/debug/main.go
index 43e616f..7368a9c 100644
--- a/tools/debug/main.go
+++ b/tools/debug/main.go
@@ -1,13 +1,13 @@
// The following enables go generate to generate the doc.go file.
-//go:generate go run $VANADIUM_ROOT/veyron/go/src/v.io/lib/cmdline/testdata/gendoc.go .
+//go:generate go run $VANADIUM_ROOT/release/go/src/v.io/lib/cmdline/testdata/gendoc.go .
package main
import (
- "v.io/veyron/veyron2"
- "v.io/veyron/veyron2/rt"
+ "v.io/core/veyron2"
+ "v.io/core/veyron2/rt"
- _ "v.io/veyron/veyron/profiles"
+ _ "v.io/core/veyron/profiles"
)
var runtime veyron2.Runtime
diff --git a/tools/debug/test.sh b/tools/debug/test.sh
index 38aca90..62fff1d 100755
--- a/tools/debug/test.sh
+++ b/tools/debug/test.sh
@@ -14,7 +14,7 @@
readonly DEBUG_FLAGS="--veyron.vtrace.sample_rate=1"
build() {
- DEBUG_BIN="$(shell_test::build_go_binary 'v.io/veyron/veyron/tools/debug')"
+ DEBUG_BIN="$(shell_test::build_go_binary 'v.io/core/veyron/tools/debug')"
}
dumplogs() {
diff --git a/tools/debug/testdata/integration_test.go b/tools/debug/testdata/integration_test.go
index 904c6bb..46fffbc 100644
--- a/tools/debug/testdata/integration_test.go
+++ b/tools/debug/testdata/integration_test.go
@@ -9,10 +9,10 @@
"strings"
"testing"
- "v.io/veyron/veyron/lib/modules"
- "v.io/veyron/veyron/lib/testutil/integration"
+ "v.io/core/veyron/lib/modules"
+ "v.io/core/veyron/lib/testutil/integration"
- _ "v.io/veyron/veyron/profiles/static"
+ _ "v.io/core/veyron/profiles/static"
)
func TestHelperProcess(t *testing.T) {
@@ -23,7 +23,7 @@
env := integration.NewTestEnvironment(t)
defer env.Cleanup()
- binary := env.BuildGoPkg("v.io/veyron/veyron/tools/debug")
+ binary := env.BuildGoPkg("v.io/core/veyron/tools/debug")
inv := binary.Start("glob", env.RootMT()+"/__debug/*")
var want string
@@ -40,7 +40,7 @@
defer env.Cleanup()
fileName := filepath.Base(env.TempFile().Name())
- binary := env.BuildGoPkg("v.io/veyron/veyron/tools/debug")
+ binary := env.BuildGoPkg("v.io/core/veyron/tools/debug")
output := binary.Start("glob", env.RootMT()+"/__debug/logs/*").Output()
// The output should contain the filename.
@@ -55,7 +55,7 @@
defer env.Cleanup()
path := env.RootMT() + "/__debug/stats/system/hostname"
- binary := env.BuildGoPkg("v.io/veyron/veyron/tools/debug")
+ binary := env.BuildGoPkg("v.io/core/veyron/tools/debug")
got := binary.Start("stats", "read", path).Output()
hostname, err := os.Hostname()
if err != nil {
@@ -79,7 +79,7 @@
env := integration.NewTestEnvironment(t)
defer env.Cleanup()
- binary := env.BuildGoPkg("v.io/veyron/veyron/tools/debug")
+ binary := env.BuildGoPkg("v.io/core/veyron/tools/debug")
testLogData := "This is a test log file"
file := createTestLogFile(t, env, testLogData)
@@ -99,7 +99,7 @@
env := integration.NewTestEnvironment(t)
defer env.Cleanup()
- binary := env.BuildGoPkg("v.io/veyron/veyron/tools/debug")
+ binary := env.BuildGoPkg("v.io/core/veyron/tools/debug")
testLogData := "This is a test log file\n"
file := createTestLogFile(t, env, testLogData)
logName := filepath.Base(file.Name())
@@ -122,7 +122,7 @@
env := integration.NewTestEnvironment(t)
defer env.Cleanup()
- binary := env.BuildGoPkg("v.io/veyron/veyron/tools/debug")
+ binary := env.BuildGoPkg("v.io/core/veyron/tools/debug")
logContent := "Hello, world!\n"
logPath := env.RootMT() + "/__debug/logs/" + filepath.Base(createTestLogFile(t, env, logContent).Name())
// Create a log file with tracing, read it and check that the resulting trace exists.
