TBR: playground: namespace_browser: Move v.io/x/ref/tools to v.io/x/ref/cmd.
This is part of the v.io reorganization. cmd is the standard
go directory for commandline binaries. We actually have two:
cmd for regular command line tools, and services for servers.
Note, I am temporarily duplicating the vdl tool for ease of transition.
MultiPart: 7/8
Change-Id: Ia40aaa7aa1c4b5234fa4c5b33f11203b09844300
diff --git a/client/lib/shell/pg_test_util.sh b/client/lib/shell/pg_test_util.sh
index 2ef83cc..ee8de06 100755
--- a/client/lib/shell/pg_test_util.sh
+++ b/client/lib/shell/pg_test_util.sh
@@ -45,11 +45,11 @@
# Installs various go binaries.
build_go_binaries() {
- shell_test::build_go_binary 'v.io/x/ref/tools/principal'
+ shell_test::build_go_binary 'v.io/x/ref/cmd/principal'
shell_test::build_go_binary 'v.io/x/ref/services/proxy/proxyd'
shell_test::build_go_binary 'v.io/x/ref/services/mounttable/mounttabled'
shell_test::build_go_binary 'v.io/x/ref/services/wsprd'
- shell_test::build_go_binary 'v.io/x/ref/tools/vdl'
+ shell_test::build_go_binary 'v.io/x/ref/cmd/vdl'
shell_test::build_go_binary 'playground/builder'
}
diff --git a/client/lib/shell/shell_test.sh b/client/lib/shell/shell_test.sh
index 17c8e76..aa2e06b 100755
--- a/client/lib/shell/shell_test.sh
+++ b/client/lib/shell/shell_test.sh
@@ -221,7 +221,7 @@
shell_test::credentials() {
[[ ! -n ${shell_test_RUNNING_UNDER_AGENT+1} ]] \
|| shell_test::fail "credentials called when running under enable_agent"
- local -r PRINCIPAL_BIN="$(shell_test::build_go_binary 'v.io/x/ref/tools/principal')"
+ local -r PRINCIPAL_BIN="$(shell_test::build_go_binary 'v.io/x/ref/cmd/principal')"
local -r CRED=$(shell::tmp_dir)
"${PRINCIPAL_BIN}" create --overwrite=true "${CRED}" "$1" >/dev/null || shell_test::fail "line ${LINENO}: create failed"
echo "${CRED}"
@@ -237,7 +237,7 @@
[[ ! -n ${shell_test_RUNNING_UNDER_AGENT+1} ]] \
|| shell_test::fail "forkcredentials called when running under enable_agent"
- local -r PRINCIPAL_BIN="$(shell_test::build_go_binary 'v.io/x/ref/tools/principal')"
+ local -r PRINCIPAL_BIN="$(shell_test::build_go_binary 'v.io/x/ref/cmd/principal')"
local -r FORKCRED=$(shell::tmp_dir)
"${PRINCIPAL_BIN}" create --overwrite=true "${FORKCRED}" self >/dev/null || shell_test::fail "line ${LINENO}: create failed"
"${PRINCIPAL_BIN}" --veyron.credentials="$1" bless --require_caveats=false "${FORKCRED}" "$2" >blessing || shell_test::fail "line ${LINENO}: bless failed"
@@ -268,6 +268,6 @@
VEYRON_CREDENTIALS="${WORKDIR}/credentials" exec ${AGENTD} --no_passphrase --additional_principals="${WORKDIR}/childcredentials" bash -"$-" "$0" "$@"
shell_test::fail "failed to run test under agent"
else
- VRUN="$(shell_test::build_go_binary 'v.io/x/ref/tools/vrun')"
+ VRUN="$(shell_test::build_go_binary 'v.io/x/ref/cmd/vrun')"
fi
}
diff --git a/client/lib/shell/test.sh b/client/lib/shell/test.sh
index 55eef87..210cd1f 100755
--- a/client/lib/shell/test.sh
+++ b/client/lib/shell/test.sh
@@ -55,7 +55,7 @@
test_credentials() {
local -r CRED=$(shell_test::credentials alice)
- local -r PRINCIPAL_BIN="$(shell_test::build_go_binary 'v.io/x/ref/tools/principal')"
+ local -r PRINCIPAL_BIN="$(shell_test::build_go_binary 'v.io/x/ref/cmd/principal')"
"${PRINCIPAL_BIN}" --veyron.credentials="${CRED}" dump >alice.dump || shell_test::fail "line ${LINENO}: ${PRINCIPAL_BIN} dump ${CRED} failed"
cat alice.dump | rmpublickey >got || shell_test::fail "line ${LINENO}: cat alice.dump | rmpublickey failed"
@@ -78,7 +78,7 @@
local -r CRED=$(shell_test::credentials alice)
local -r FORKCRED=$(shell_test::forkcredentials "${CRED}" fork)
- local -r PRINCIPAL_BIN="$(shell_test::build_go_binary 'v.io/x/ref/tools/principal')"
+ local -r PRINCIPAL_BIN="$(shell_test::build_go_binary 'v.io/x/ref/cmd/principal')"
"${PRINCIPAL_BIN}" --veyron.credentials="${FORKCRED}" dump >alice.dump || shell_test::fail "line ${LINENO}: ${PRINCIPAL_BIN} dump ${CRED} failed"
cat alice.dump | rmpublickey >got || shell_test::fail "line ${LINENO}: cat alice.dump | rmpublickey failed"
diff --git a/go/src/playground/playground_v23_test.go b/go/src/playground/playground_v23_test.go
index 7833a05..c55b1f4 100644
--- a/go/src/playground/playground_v23_test.go
+++ b/go/src/playground/playground_v23_test.go
@@ -80,8 +80,8 @@
func V23TestPlayground(i *v23tests.T) {
v23tests.RunRootMT(i, "--veyron.tcp.address=127.0.0.1:0")
- i.BuildGoPkg("v.io/x/ref/tools/principal")
- i.BuildGoPkg("v.io/x/ref/tools/vdl")
+ i.BuildGoPkg("v.io/x/ref/cmd/principal")
+ i.BuildGoPkg("v.io/x/ref/cmd/vdl")
i.BuildGoPkg("v.io/x/ref/services/proxy/proxyd")
i.BuildGoPkg("v.io/x/ref/services/wsprd")
