Merge "x/ref: Flatten lib/exec/consts into lib/exec"
diff --git a/lib/exec/child.go b/lib/exec/child.go
index b80033c..4cb59a0 100644
--- a/lib/exec/child.go
+++ b/lib/exec/child.go
@@ -13,12 +13,11 @@
"unicode/utf8"
"v.io/v23/verror"
- "v.io/x/ref/lib/exec/consts"
)
var (
- ErrNoVersion = verror.Register(pkgPath+".ErrNoVersion", verror.NoRetry, "{1:}{2:} "+consts.ExecVersionVariable+" environment variable missing{:_}")
- ErrUnsupportedVersion = verror.Register(pkgPath+".ErrUnsupportedVersion", verror.NoRetry, "{1:}{2:} Unsupported version of v.io/x/ref/lib/exec request by "+consts.ExecVersionVariable+" environment variable{:_}")
+ ErrNoVersion = verror.Register(pkgPath+".ErrNoVersion", verror.NoRetry, "{1:}{2:} "+ExecVersionVariable+" environment variable missing{:_}")
+ ErrUnsupportedVersion = verror.Register(pkgPath+".ErrUnsupportedVersion", verror.NoRetry, "{1:}{2:} Unsupported version of v.io/x/ref/lib/exec request by "+ExecVersionVariable+" environment variable{:_}")
errDifferentStatusSent = verror.Register(pkgPath+".errDifferentStatusSent", verror.NoRetry, "{1:}{2:} A different status: {3} has already been sent{:_}")
errPartialRead = verror.Register(pkgPath+".PartialRead", verror.NoRetry, "{1:}{2:} partial read{:_}")
@@ -124,11 +123,11 @@
func createChildHandle() (*ChildHandle, error) {
// TODO(cnicolaou): need to use major.minor.build format for
// version #s.
- switch os.Getenv(consts.ExecVersionVariable) {
+ switch os.Getenv(ExecVersionVariable) {
case "":
return nil, verror.New(ErrNoVersion, nil)
case version1:
- os.Setenv(consts.ExecVersionVariable, "")
+ os.Setenv(ExecVersionVariable, "")
default:
return nil, verror.New(ErrUnsupportedVersion, nil)
}
diff --git a/lib/exec/consts.go b/lib/exec/consts.go
new file mode 100644
index 0000000..f275d78
--- /dev/null
+++ b/lib/exec/consts.go
@@ -0,0 +1,14 @@
+// Copyright 2015 The Vanadium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package exec
+
+// ExecVersionVariable is the name of the environment variable used by the exec
+// package to communicate the protocol version between the parent and child. It
+// takes care to clear this variable from the child process' environment as soon
+// as it can, however, there may still be some situations where an application
+// may need to test for its presence or ensure that it doesn't appear in a set
+// of environment variables; exposing the name of this variable is intended to
+// support such situations.
+const ExecVersionVariable = "V23_EXEC_VERSION"
diff --git a/lib/exec/consts/consts.go b/lib/exec/consts/consts.go
deleted file mode 100644
index d6a1f1d..0000000
--- a/lib/exec/consts/consts.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2015 The Vanadium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package consts defines constants used by the exec library.
-package consts
-
-// The exec package uses this environment variable to communicate
-// the version of the protocol being used between the parent and child.
-// It takes care to clear this variable from the child process'
-// environment as soon as it can, however, there may still be some
-// situations where an application may need to test for its presence
-// or ensure that it doesn't appear in a set of environment variables;
-// exposing the name of this variable is intended to support such
-// situations.
-const ExecVersionVariable = "V23_EXEC_VERSION"
diff --git a/lib/exec/exec_test.go b/lib/exec/exec_test.go
index 0eaf7af..10cdb50 100644
--- a/lib/exec/exec_test.go
+++ b/lib/exec/exec_test.go
@@ -19,7 +19,6 @@
"v.io/v23/verror"
vexec "v.io/x/ref/lib/exec"
- "v.io/x/ref/lib/exec/consts"
// Use mock timekeeper to avoid actually sleeping during the test.
"v.io/x/ref/test/timekeeper"
)
@@ -459,9 +458,9 @@
}
func verifyNoExecVariable() {
- version := os.Getenv(consts.ExecVersionVariable)
+ version := os.Getenv(vexec.ExecVersionVariable)
if len(version) != 0 {
- log.Fatalf("Version variable %q has a value: %s", consts.ExecVersionVariable, version)
+ log.Fatalf("Version variable %q has a value: %s", vexec.ExecVersionVariable, version)
}
}
@@ -475,9 +474,9 @@
}
defer os.Exit(0)
- version := os.Getenv(consts.ExecVersionVariable)
+ version := os.Getenv(vexec.ExecVersionVariable)
if len(version) == 0 {
- log.Fatalf("Version variable %q has no value", consts.ExecVersionVariable)
+ log.Fatalf("Version variable %q has no value", vexec.ExecVersionVariable)
}
// Write errors to stderr or using log. since the parent
diff --git a/lib/exec/noprotocol_test.go b/lib/exec/noprotocol_test.go
index 78564c9..ba0444b 100644
--- a/lib/exec/noprotocol_test.go
+++ b/lib/exec/noprotocol_test.go
@@ -14,7 +14,6 @@
"v.io/v23/verror"
vexec "v.io/x/ref/lib/exec"
- "v.io/x/ref/lib/exec/consts"
)
func TestNoExecProtocol(t *testing.T) {
@@ -27,11 +26,11 @@
if got, want := ph.WaitForReady(time.Minute), vexec.ErrNotUsingProtocol.ID; verror.ErrorID(got) != want {
t.Fatalf("got %v, want %v", got, want)
}
- re := regexp.MustCompile(fmt.Sprintf(".*%s=.*", consts.ExecVersionVariable))
+ re := regexp.MustCompile(fmt.Sprintf(".*%s=.*", vexec.ExecVersionVariable))
scanner := bufio.NewScanner(stdout)
for scanner.Scan() {
if re.MatchString(scanner.Text()) {
- t.Fatalf("%s passed to child", consts.ExecVersionVariable)
+ t.Fatalf("%s passed to child", vexec.ExecVersionVariable)
}
}
}
diff --git a/lib/exec/parent.go b/lib/exec/parent.go
index d011cfb..8431820 100644
--- a/lib/exec/parent.go
+++ b/lib/exec/parent.go
@@ -21,7 +21,6 @@
"v.io/x/lib/vlog"
- "v.io/x/ref/lib/exec/consts"
"v.io/x/ref/lib/timekeeper"
)
@@ -127,12 +126,12 @@
// Start starts the child process, sharing a secret with it and
// setting up a communication channel over which to read its status.
func (p *ParentHandle) Start() error {
- // Make sure that there are no instances of the consts.ExecVersionVariable
+ // Make sure that there are no instances of the ExecVersionVariable
// already in the environment (which can happen when a subprocess
// creates a subprocess etc)
nenv := make([]string, 0, len(p.c.Env)+1)
for _, e := range p.c.Env {
- if strings.HasPrefix(e, consts.ExecVersionVariable+"=") {
+ if strings.HasPrefix(e, ExecVersionVariable+"=") {
continue
}
nenv = append(nenv, e)
@@ -142,7 +141,7 @@
return p.c.Start()
}
- p.c.Env = append(nenv, consts.ExecVersionVariable+"="+version1)
+ p.c.Env = append(nenv, ExecVersionVariable+"="+version1)
// Create anonymous pipe for communicating data between the child
// and the parent.
diff --git a/test/modules/modules_test.go b/test/modules/modules_test.go
index 025a4c0..82a13cc 100644
--- a/test/modules/modules_test.go
+++ b/test/modules/modules_test.go
@@ -25,7 +25,6 @@
"v.io/x/ref/envvar"
"v.io/x/ref/lib/exec"
- execconsts "v.io/x/ref/lib/exec/consts"
_ "v.io/x/ref/profiles"
vsecurity "v.io/x/ref/security"
"v.io/x/ref/test"
@@ -603,7 +602,7 @@
}
for _, want := range childEnv {
- if want == "\""+execconsts.ExecVersionVariable+"=\"" {
+ if want == "\""+exec.ExecVersionVariable+"=\"" {
continue
}
if !find(want, shEnv) {
