summaryrefslogtreecommitdiffhomepage
path: root/test
diff options
context:
space:
mode:
authorZach Koopmans <zkoopmans@google.com>2020-08-31 17:15:14 -0700
committergVisor bot <gvisor-bot@google.com>2020-08-31 17:17:09 -0700
commit67484384935fa814e978f08dfa0f0bdbddbbd371 (patch)
treecb80b8fa69c6afd90a946fb8a13568778b86084d /test
parent101c97d6f851abbd3024605102757da66a36551f (diff)
Fix bug in bazel build benchmark.
PiperOrigin-RevId: 329409802
Diffstat (limited to 'test')
-rw-r--r--test/benchmarks/fs/bazel_test.go9
1 files changed, 5 insertions, 4 deletions
diff --git a/test/benchmarks/fs/bazel_test.go b/test/benchmarks/fs/bazel_test.go
index fdbbfe280..ef1b8e4ea 100644
--- a/test/benchmarks/fs/bazel_test.go
+++ b/test/benchmarks/fs/bazel_test.go
@@ -62,7 +62,7 @@ func runBuildBenchmark(b *testing.B, image, workdir, target string) {
container := machine.GetContainer(ctx, b)
defer container.CleanUp(ctx)
- // Start a container and sleep by an order of b.N.
+ // Start a container and sleep.
if err := container.Spawn(ctx, dockerutil.RunOpts{
Image: image,
}, "sleep", fmt.Sprintf("%d", 1000000)); err != nil {
@@ -70,12 +70,13 @@ func runBuildBenchmark(b *testing.B, image, workdir, target string) {
}
// If we are running on a tmpfs, copy to /tmp which is a tmpfs.
+ prefix := ""
if bm.tmpfs {
if out, err := container.Exec(ctx, dockerutil.ExecOpts{},
"cp", "-r", workdir, "/tmp/."); err != nil {
b.Fatalf("failed to copy directory: %v (%s)", err, out)
}
- workdir = "/tmp" + workdir
+ prefix = "/tmp"
}
// Restart profiles after the copy.
@@ -94,7 +95,7 @@ func runBuildBenchmark(b *testing.B, image, workdir, target string) {
b.StartTimer()
got, err := container.Exec(ctx, dockerutil.ExecOpts{
- WorkDir: workdir,
+ WorkDir: prefix + workdir,
}, "bazel", "build", "-c", "opt", target)
if err != nil {
b.Fatalf("build failed with: %v", err)
@@ -107,7 +108,7 @@ func runBuildBenchmark(b *testing.B, image, workdir, target string) {
}
// Clean bazel in case we use b.N.
_, err = container.Exec(ctx, dockerutil.ExecOpts{
- WorkDir: workdir,
+ WorkDir: prefix + workdir,
}, "bazel", "clean")
if err != nil {
b.Fatalf("build failed with: %v", err)