4 files changed, 0 insertions, 272 deletions
diff --git a/test/benchmarks/harness/BUILD b/test/benchmarks/harness/BUILD
deleted file mode 100644
index 116610938..000000000
--- a/test/benchmarks/harness/BUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-load("//tools:defs.bzl", "go_library")
-
-package(licenses = ["notice"])
-
-go_library(
-    name = "harness",
-    testonly = 1,
-    srcs = [
-        "harness.go",
-        "machine.go",
-        "util.go",
-    ],
-    visibility = ["//:sandbox"],
-    deps = [
-        "//pkg/test/dockerutil",
-        "//pkg/test/testutil",
-        "@com_github_docker_docker//api/types/mount:go_default_library",
-    ],
-)
diff --git a/test/benchmarks/harness/harness.go b/test/benchmarks/harness/harness.go
deleted file mode 100644
index a853b7ba8..000000000
--- a/test/benchmarks/harness/harness.go
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2020 The gVisor Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package harness holds utility code for running benchmarks on Docker.
-package harness
-
-import (
-	"flag"
-	"fmt"
-	"os"
-
-	"gvisor.dev/gvisor/pkg/test/dockerutil"
-)
-
-var (
-	help  = flag.Bool("help", false, "print this usage message")
-	debug = flag.Bool("debug", false, "turns on debug messages for individual benchmarks")
-)
-
-// Init performs any harness initilialization before runs.
-func Init() error {
-	flag.Usage = func() {
-		fmt.Fprintf(os.Stderr, "Usage: %s -- --test.bench=<regex>\n", os.Args[0])
-		flag.PrintDefaults()
-	}
-	flag.Parse()
-	if *help {
-		flag.Usage()
-		os.Exit(0)
-	}
-	dockerutil.EnsureSupportedDockerVersion()
-	return nil
-}
-
-// SetFixedBenchmarks causes all benchmarks to run once.
-//
-// This must be set if they cannot scale with N. Note that this uses 1ns
-// instead of 1x due to https://github.com/golang/go/issues/32051.
-func SetFixedBenchmarks() {
-	flag.Set("test.benchtime", "1ns")
-}
-
-// GetMachine returns this run's implementation of machine.
-func GetMachine() (Machine, error) {
-	return &localMachine{}, nil
-}
diff --git a/test/benchmarks/harness/machine.go b/test/benchmarks/harness/machine.go
deleted file mode 100644
index 405b646e8..000000000
--- a/test/benchmarks/harness/machine.go
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright 2020 The gVisor Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package harness
-
-import (
-	"context"
-	"errors"
-	"net"
-	"os/exec"
-
-	"gvisor.dev/gvisor/pkg/test/dockerutil"
-	"gvisor.dev/gvisor/pkg/test/testutil"
-)
-
-// Machine describes a real machine for use in benchmarks.
-type Machine interface {
-	// GetContainer gets a container from the machine. The container uses the
-	// runtime under test and is profiled if requested by flags.
-	GetContainer(ctx context.Context, log testutil.Logger) *dockerutil.Container
-
-	// GetNativeContainer gets a native container from the machine. Native containers
-	// use runc by default and are not profiled.
-	GetNativeContainer(ctx context.Context, log testutil.Logger) *dockerutil.Container
-
-	// RunCommand runs cmd on this machine.
-	RunCommand(cmd string, args ...string) (string, error)
-
-	// Returns IP Address for the machine.
-	IPAddress() (net.IP, error)
-
-	// CleanUp cleans up this machine.
-	CleanUp()
-}
-
-// localMachine describes this machine.
-type localMachine struct {
-}
-
-// GetContainer implements Machine.GetContainer for localMachine.
-func (l *localMachine) GetContainer(ctx context.Context, logger testutil.Logger) *dockerutil.Container {
-	return dockerutil.MakeContainer(ctx, logger)
-}
-
-// GetContainer implements Machine.GetContainer for localMachine.
-func (l *localMachine) GetNativeContainer(ctx context.Context, logger testutil.Logger) *dockerutil.Container {
-	return dockerutil.MakeNativeContainer(ctx, logger)
-}
-
-// RunCommand implements Machine.RunCommand for localMachine.
-func (l *localMachine) RunCommand(cmd string, args ...string) (string, error) {
-	c := exec.Command(cmd, args...)
-	out, err := c.CombinedOutput()
-	return string(out), err
-}
-
-// IPAddress implements Machine.IPAddress.
-func (l *localMachine) IPAddress() (net.IP, error) {
-	addrs, err := net.InterfaceAddrs()
-	if err != nil {
-		return net.IP{}, err
-	}
-	for _, a := range addrs {
-		if ipnet, ok := a.(*net.IPNet); ok && !ipnet.IP.IsLoopback() {
-			if ipnet.IP.To4() != nil {
-				return ipnet.IP, nil
-			}
-		}
-	}
-	// Unable to locate non-loopback address.
-	return nil, errors.New("no IPAddress available")
-}
-
-// CleanUp implements Machine.CleanUp and does nothing for localMachine.
-func (*localMachine) CleanUp() {
-}
diff --git a/test/benchmarks/harness/util.go b/test/benchmarks/harness/util.go
deleted file mode 100644
index 36abe1069..000000000
--- a/test/benchmarks/harness/util.go
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright 2020 The gVisor Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package harness
-
-import (
-	"context"
-	"fmt"
-	"net"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types/mount"
-	"gvisor.dev/gvisor/pkg/test/dockerutil"
-	"gvisor.dev/gvisor/pkg/test/testutil"
-)
-
-//TODO(gvisor.dev/issue/3535): move to own package or move methods to harness struct.
-
-// WaitUntilServing grabs a container from `machine` and waits for a server at
-// IP:port.
-func WaitUntilServing(ctx context.Context, machine Machine, server net.IP, port int) error {
-	var logger testutil.DefaultLogger = "util"
-	netcat := machine.GetNativeContainer(ctx, logger)
-	defer netcat.CleanUp(ctx)
-
-	cmd := fmt.Sprintf("while ! wget -q --spider http://%s:%d; do true; done", server, port)
-	_, err := netcat.Run(ctx, dockerutil.RunOpts{
-		Image: "benchmarks/util",
-	}, "sh", "-c", cmd)
-	return err
-}
-
-// DropCaches drops caches on the provided machine. Requires root.
-func DropCaches(machine Machine) error {
-	if out, err := machine.RunCommand("/bin/sh", "-c", "sync && sysctl vm.drop_caches=3"); err != nil {
-		return fmt.Errorf("failed to drop caches: %v logs: %s", err, out)
-	}
-	return nil
-}
-
-// DebugLog prints debug messages if the debug flag is set.
-func DebugLog(b *testing.B, msg string, args ...interface{}) {
-	b.Helper()
-	if *debug {
-		b.Logf(msg, args...)
-	}
-}
-
-const (
-	// BindFS indicates a bind mount should be created.
-	BindFS = "bindfs"
-	// TmpFS indicates a tmpfs mount should be created.
-	TmpFS = "tmpfs"
-	// RootFS indicates no mount should be created and the root mount should be used.
-	RootFS = "rootfs"
-)
-
-// MakeMount makes a mount and cleanup based on the requested type. Bind
-// and volume mounts are backed by a temp directory made with mktemp.
-// tmpfs mounts require no such backing and are just made.
-// rootfs mounts do not make a mount, but instead return a target direectory at root.
-// It is up to the caller to call the returned cleanup.
-func MakeMount(machine Machine, fsType string) ([]mount.Mount, string, func(), error) {
-	mounts := make([]mount.Mount, 0, 1)
-	switch fsType {
-	case BindFS:
-		dir, err := machine.RunCommand("mktemp", "-d")
-		if err != nil {
-			return mounts, "", func() {}, fmt.Errorf("failed to create tempdir: %v", err)
-		}
-		dir = strings.TrimSuffix(dir, "\n")
-
-		out, err := machine.RunCommand("chmod", "777", dir)
-		if err != nil {
-			machine.RunCommand("rm", "-rf", dir)
-			return mounts, "", func() {}, fmt.Errorf("failed modify directory: %v %s", err, out)
-		}
-		target := "/data"
-		mounts = append(mounts, mount.Mount{
-			Target: target,
-			Source: dir,
-			Type:   mount.TypeBind,
-		})
-		return mounts, target, func() { machine.RunCommand("rm", "-rf", dir) }, nil
-	case RootFS:
-		return mounts, "/", func() {}, nil
-	case TmpFS:
-		target := "/data"
-		mounts = append(mounts, mount.Mount{
-			Target: target,
-			Type:   mount.TypeTmpfs,
-		})
-		return mounts, target, func() {}, nil
-	default:
-		return mounts, "", func() {}, fmt.Errorf("illegal mount type not supported: %v", fsType)
-	}
-}