diff options
| author | Adin Scannell <ascannell@google.com> | 2020-07-20 18:03:04 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-07-20 18:05:05 -0700 |
| commit | e1a04f84e864b9a5c8a51a7cdd32f8db5377aff1 (patch) | |
| tree | a510d622d94d79d5fd1c07617d013b91a0dd3dd6 /test/root/crictl_test.go | |
| parent | feb1d3d5a7d9c26ab1533b350a9d6088148641aa (diff) | |
Add standard entrypoints for test targets.
PiperOrigin-RevId: 322265513
Diffstat (limited to 'test/root/crictl_test.go')
| -rw-r--r-- | test/root/crictl_test.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/test/root/crictl_test.go b/test/root/crictl_test.go index 193705ab8..df91fa0fe 100644 --- a/test/root/crictl_test.go +++ b/test/root/crictl_test.go @@ -405,11 +405,8 @@ func setup(t *testing.T, version string) (*criutil.Crictl, func(), error) { } // We provide the shim, followed by the runtime, and then a - // temporary root directory. Note that we can safely assume - // that the shim has been installed in the same directory as - // the runtime (for test installs and for normal installs). - // Since this is v1, the binary name will be fixed. - config = fmt.Sprintf(v1Template, path.Join(runtimeDir, "gvisor-containerd-shim"), runtime, runtimeDir) + // temporary root directory. + config = fmt.Sprintf(v1Template, criutil.ResolvePath("gvisor-containerd-shim"), runtime, containerdRoot) case v2: // This is only supported past 1.2. if major < 1 || (major == 1 && minor <= 1) { |