v.io/jiri/profiles: significant refactoring of profiles package:
changes needed for v.io/c/18567:
MultiPart: 3/3
Change-Id: I8d9dc67e92b74fd7d4ff86ee0071ee7de49b6b2e
diff --git a/go/src/v.io/x/mojo/tests/util/mojo_shell_runner.go b/go/src/v.io/x/mojo/tests/util/mojo_shell_runner.go
index b19f283..ac5562d 100644
--- a/go/src/v.io/x/mojo/tests/util/mojo_shell_runner.go
+++ b/go/src/v.io/x/mojo/tests/util/mojo_shell_runner.go
@@ -13,6 +13,7 @@
"v.io/jiri/jiri"
"v.io/jiri/profiles"
+ "v.io/jiri/profiles/reader"
"v.io/x/lib/cmdline"
"v.io/x/lib/envvar"
"v.io/x/lib/timing"
@@ -24,12 +25,12 @@
if err != nil {
panic(err)
}
- _, err = profiles.NewConfigHelper(jirix, profiles.UseProfiles, filepath.Join(jirix.Root, ".jiri_v23_profiles"))
+ rd, err := reader.NewReader(jirix, reader.UseProfiles, filepath.Join(jirix.Root, ".jiri_v23_profiles"))
if err != nil {
panic(err)
}
- envslice := profiles.EnvFromProfile(target, mojoProfileName())
+ envslice := rd.EnvFromProfile(mojoProfileName(), target)
env := envvar.VarsFromSlice(envslice)
jiri.ExpandEnv(jirix, env)
var mojoDevtools, mojoShell, mojoServices string
