2 files changed, 18 insertions, 9 deletions
diff --git a/test/benchmarks/fs/bazel_test.go b/test/benchmarks/fs/bazel_test.go
index 3854aa87c..f4236ba37 100644
--- a/test/benchmarks/fs/bazel_test.go
+++ b/test/benchmarks/fs/bazel_test.go
@@ -24,7 +24,18 @@ import (
 )
 
 // Note: CleanCache versions of this test require running with root permissions.
-func BenchmarkABSL(b *testing.B) {
+func BenchmarkBuildABSL(b *testing.B) {
+	runBuildBenchmark(b, "benchmarks/absl", "/abseil-cpp", "absl/base/...")
+}
+
+// Note: CleanCache versions of this test require running with root permissions.
+// Note: This test takes on the order of 10m per permutation for runsc on kvm.
+func BenchmarkBuildRunsc(b *testing.B) {
+	runBuildBenchmark(b, "benchmarks/runsc", "/gvisor", "runsc:runsc")
+}
+
+func runBuildBenchmark(b *testing.B, image, workdir, target string) {
+	b.Helper()
 	// Get a machine from the Harness on which to run.
 	machine, err := h.GetMachine()
 	if err != nil {
@@ -51,20 +62,18 @@ func BenchmarkABSL(b *testing.B) {
 			container := machine.GetContainer(ctx, b)
 			defer container.CleanUp(ctx)
 
-			workdir := "/abseil-cpp"
-
 			// Start a container and sleep by an order of b.N.
 			if err := container.Spawn(ctx, dockerutil.RunOpts{
-				Image: "benchmarks/absl",
+				Image: image,
 			}, "sleep", fmt.Sprintf("%d", 1000000)); err != nil {
 				b.Fatalf("run failed with: %v", err)
 			}
 
 			// If we are running on a tmpfs, copy to /tmp which is a tmpfs.
 			if bm.tmpfs {
-				if _, err := container.Exec(ctx, dockerutil.ExecOpts{},
-					"cp", "-r", "/abseil-cpp", "/tmp/."); err != nil {
-					b.Fatal("failed to copy directory: %v", err)
+				if out, err := container.Exec(ctx, dockerutil.ExecOpts{},
+					"cp", "-r", workdir, "/tmp/."); err != nil {
+					b.Fatal("failed to copy directory: %v %s", err, out)
 				}
 				workdir = "/tmp" + workdir
 			}
@@ -86,7 +95,7 @@ func BenchmarkABSL(b *testing.B) {
 
 				got, err := container.Exec(ctx, dockerutil.ExecOpts{
 					WorkDir: workdir,
-				}, "bazel", "build", "-c", "opt", "absl/base/...")
+				}, "bazel", "build", "-c", "opt", target)
 				if err != nil {
 					b.Fatalf("build failed with: %v", err)
 				}
diff --git a/test/benchmarks/network/node_test.go b/test/benchmarks/network/node_test.go
index 2556f710f..f9278ab66 100644
--- a/test/benchmarks/network/node_test.go
+++ b/test/benchmarks/network/node_test.go
@@ -73,7 +73,7 @@ func runNode(b *testing.B, requests, concurrency int) {
 	if out, err := redis.WaitForOutput(ctx, "Ready to accept connections", 3*time.Second); err != nil {
 		b.Fatalf("failed to start redis server: %v %s", err, out)
 	}
-	redisIP, err := redis.FindIP(ctx)
+	redisIP, err := redis.FindIP(ctx, false)
 	if err != nil {
 		b.Fatalf("failed to get IP from redis instance: %v", err)
 	}