diff options
| author | Fabricio Voznika <fvoznika@google.com> | 2020-06-17 18:41:55 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-06-17 18:43:26 -0700 |
| commit | 97f6b20e89d99c4d92d6491ef3fad0933c9ba53d (patch) | |
| tree | 882af70a9f52ae1eefef23ed48014e09f160abd3 /test/runtimes/runner | |
| parent | 57286eb642b9becc566f8e9c1dcbe24619f7772b (diff) | |
Move mount configutation to RunOpts
Separate mount configuration from links and move it to
RunOpts, like the other options.
PiperOrigin-RevId: 317010158
Diffstat (limited to 'test/runtimes/runner')
| -rw-r--r-- | test/runtimes/runner/main.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/runtimes/runner/main.go b/test/runtimes/runner/main.go index 7989dca84..54d1169ef 100644 --- a/test/runtimes/runner/main.go +++ b/test/runtimes/runner/main.go @@ -79,10 +79,11 @@ func runTests() int { // getTests executes all tests as table tests. func getTests(d *dockerutil.Docker, excludes map[string]struct{}) ([]testing.InternalTest, error) { // Start the container. - d.CopyFiles("/proctor", "test/runtimes/proctor/proctor") - if err := d.Spawn(dockerutil.RunOpts{ + opts := dockerutil.RunOpts{ Image: fmt.Sprintf("runtimes/%s", *image), - }, "/proctor/proctor", "--pause"); err != nil { + } + d.CopyFiles(&opts, "/proctor", "test/runtimes/proctor/proctor") + if err := d.Spawn(opts, "/proctor/proctor", "--pause"); err != nil { return nil, fmt.Errorf("docker run failed: %v", err) } |