sensorlog_lite: Prepare for blessing chain separator change.
Also move from v23 to jiri.
Change-Id: I1d89369cf0bab3dc921a3ad3bf83e7265cf121dd
diff --git a/go/src/v.io/x/sensorlog/Makefile b/go/src/v.io/x/sensorlog/Makefile
index ec5ca7c..ff9986e 100644
--- a/go/src/v.io/x/sensorlog/Makefile
+++ b/go/src/v.io/x/sensorlog/Makefile
@@ -10,14 +10,14 @@
.PHONY: measured
measured:
- v23 go install v.io/x/sensorlog_lite/measured
+ jiri go install v.io/x/sensorlog_lite/measured
.PHONY: run-deps
run-deps:
- v23 go install v.io/x/ref/services/mounttable/mounttabled
- v23 go install v.io/x/ref/services/syncbase/syncbased
- v23 go install v.io/x/ref/services/agent/vbecome
+ jiri go install v.io/x/ref/services/mounttable/mounttabled
+ jiri go install v.io/x/ref/services/syncbase/syncbased
+ jiri go install v.io/x/ref/services/agent/vbecome
.PHONY: test
test:
- v23 go test v.io/x/sensorlog_lite/...
+ jiri go test v.io/x/sensorlog_lite/...
diff --git a/go/src/v.io/x/sensorlog/scripts/runner_lib.sh b/go/src/v.io/x/sensorlog/scripts/runner_lib.sh
index 9d56477..c81b82b 100644
--- a/go/src/v.io/x/sensorlog/scripts/runner_lib.sh
+++ b/go/src/v.io/x/sensorlog/scripts/runner_lib.sh
@@ -16,11 +16,17 @@
}
export -f kill_child_processes
+function name_to_blessing() {
+ local -r CHAIN_SEPARATOR='/'
+ sed -e "s,/,${CHAIN_SEPARATOR},g" <<< "$@"
+}
+export -f name_to_blessing
+
function run_mounttabled() {
local -r BLESSNAME="$1"
local -r NAME="$2"
local -r IPADDR_PORT="$3"
- "${JIRI_ROOT}"/release/go/bin/vbecome -name="${BLESSNAME}/sl/mounttabled/${NAME}" \
+ "${JIRI_ROOT}"/release/go/bin/vbecome -name="$(name_to_blessing "${BLESSNAME}/sl/mounttabled/${NAME}")" \
"${JIRI_ROOT}"/release/go/bin/mounttabled -v23.tcp.address "${IPADDR_PORT}" \
&
sleep 1
@@ -33,7 +39,7 @@
local -r NAME="$3"
local -r TMPDIR="$4"
local -r DEF_BLESSING_ROOT="$("${JIRI_ROOT}"/release/go/bin/principal dump -s | cut -d ' ' -f 1 | cut -d ',' -f 1)"
- local -r DEF_BLESSING_RUNNER="${DEF_BLESSING_ROOT}/${BLESSNAME}/sl/${NAME}"
+ local -r DEF_BLESSING_RUNNER="$(name_to_blessing "${DEF_BLESSING_ROOT}/${BLESSNAME}/sl/${NAME}")"
# Everyone can Resolve to be able to join the syncgroup.
echo "$DEF_BLESSING_RUNNER"
local -r PERMISSIONS_LITERAL="{\
@@ -43,7 +49,7 @@
\"Debug\":{\"In\":[\"${DEF_BLESSING_RUNNER}\"]}, \
\"Resolve\":{\"In\":[\"...\"]} \
}"
- "${JIRI_ROOT}"/release/go/bin/vbecome -name="${BLESSNAME}/sl/syncbased/${NAME}" \
+ "${JIRI_ROOT}"/release/go/bin/vbecome -name="$(name_to_blessing "${BLESSNAME}/sl/syncbased/${NAME}")" \
"${JIRI_ROOT}"/release/go/bin/syncbased -v23.namespace.root "${MT}" \
-name "syncbased/${NAME}" -engine leveldb -root-dir "${TMPDIR}/syncbased/${NAME}" \
-v23.permissions.literal="${PERMISSIONS_LITERAL}" \
@@ -58,7 +64,7 @@
local -r NAME="$3"
local -r TMPDIR="$4"
run_syncbased "${BLESSNAME}" "${MT}" "measured/${NAME}" "${TMPDIR}"
- "${JIRI_ROOT}"/release/go/bin/vbecome -name="${BLESSNAME}/sl/measured/${NAME}" \
+ "${JIRI_ROOT}"/release/go/bin/vbecome -name="$(name_to_blessing "${BLESSNAME}/sl/measured/${NAME}")" \
"${JIRI_ROOT}"/experimental/projects/sensorlog_lite/bin/measured -v23.namespace.root "${MT}" \
-service "syncbased/measured/${NAME}" -alsologtostderr \
&
