Support partitions for other tests.

PiperOrigin-RevId: 345399936

2 files changed, 10 insertions, 26 deletions

diff --git a/test/runtimes/runner/lib/lib.go b/test/runtimes/runner/lib/lib.go
index 2f1083baf..9272137ff 100644
--- a/test/runtimes/runner/lib/lib.go
+++ b/test/runtimes/runner/lib/lib.go
@@ -34,12 +34,7 @@ import (
 // RunTests is a helper that is called by main. It exists so that we can run
 // defered functions before exiting. It returns an exit code that should be
 // passed to os.Exit.
-func RunTests(lang, image, excludeFile string, partitionNum, totalPartitions, batchSize int, timeout time.Duration) int {
-	if partitionNum <= 0 || totalPartitions <= 0 || partitionNum > totalPartitions {
-		fmt.Fprintf(os.Stderr, "invalid partition %d of %d", partitionNum, totalPartitions)
-		return 1
-	}
-
+func RunTests(lang, image, excludeFile string, batchSize int, timeout time.Duration) int {
 	// TODO(gvisor.dev/issue/1624): Remove those tests from all exclude lists
 	// that only fail with VFS1.
 
@@ -63,7 +58,7 @@ func RunTests(lang, image, excludeFile string, partitionNum, totalPartitions, ba
 	// Get a slice of tests to run. This will also start a single Docker
 	// container that will be used to run each test. The final test will
 	// stop the Docker container.
-	tests, err := getTests(ctx, d, lang, image, partitionNum, totalPartitions, batchSize, timeout, excludes)
+	tests, err := getTests(ctx, d, lang, image, batchSize, timeout, excludes)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "%s\n", err.Error())
 		return 1
@@ -74,7 +69,7 @@ func RunTests(lang, image, excludeFile string, partitionNum, totalPartitions, ba
 }
 
 // getTests executes all tests as table tests.
-func getTests(ctx context.Context, d *dockerutil.Container, lang, image string, partitionNum, totalPartitions, batchSize int, timeout time.Duration, excludes map[string]struct{}) ([]testing.InternalTest, error) {
+func getTests(ctx context.Context, d *dockerutil.Container, lang, image string, batchSize int, timeout time.Duration, excludes map[string]struct{}) ([]testing.InternalTest, error) {
 	// Start the container.
 	opts := dockerutil.RunOpts{
 		Image: fmt.Sprintf("runtimes/%s", image),
@@ -90,18 +85,9 @@ func getTests(ctx context.Context, d *dockerutil.Container, lang, image string,
 		return nil, fmt.Errorf("docker exec failed: %v", err)
 	}
 
-	// Calculate a subset of tests to run corresponding to the current
-	// shard.
+	// Calculate a subset of tests.
 	tests := strings.Fields(list)
 	sort.Strings(tests)
-
-	partitionSize := len(tests) / totalPartitions
-	if partitionNum == totalPartitions {
-		tests = tests[(partitionNum-1)*partitionSize:]
-	} else {
-		tests = tests[(partitionNum-1)*partitionSize : partitionNum*partitionSize]
-	}
-
 	indices, err := testutil.TestIndicesForShard(len(tests))
 	if err != nil {
 		return nil, fmt.Errorf("TestsForShard() failed: %v", err)
diff --git a/test/runtimes/runner/main.go b/test/runtimes/runner/main.go
index 5b3443e36..ec79a22c2 100644
--- a/test/runtimes/runner/main.go
+++ b/test/runtimes/runner/main.go
@@ -25,13 +25,11 @@ import (
 )
 
 var (
-	lang            = flag.String("lang", "", "language runtime to test")
-	image           = flag.String("image", "", "docker image with runtime tests")
-	excludeFile     = flag.String("exclude_file", "", "file containing list of tests to exclude, in CSV format with fields: test name, bug id, comment")
-	partition       = flag.Int("partition", 1, "partition number, this is 1-indexed")
-	totalPartitions = flag.Int("total_partitions", 1, "total number of partitions")
-	batchSize       = flag.Int("batch", 50, "number of test cases run in one command")
-	timeout         = flag.Duration("timeout", 90*time.Minute, "batch timeout")
+	lang        = flag.String("lang", "", "language runtime to test")
+	image       = flag.String("image", "", "docker image with runtime tests")
+	excludeFile = flag.String("exclude_file", "", "file containing list of tests to exclude, in CSV format with fields: test name, bug id, comment")
+	batchSize   = flag.Int("batch", 50, "number of test cases run in one command")
+	timeout     = flag.Duration("timeout", 90*time.Minute, "batch timeout")
 )
 
 func main() {
@@ -40,5 +38,5 @@ func main() {
 		fmt.Fprintf(os.Stderr, "lang and image flags must not be empty\n")
 		os.Exit(1)
 	}
-	os.Exit(lib.RunTests(*lang, *image, *excludeFile, *partition, *totalPartitions, *batchSize, *timeout))
+	os.Exit(lib.RunTests(*lang, *image, *excludeFile, *batchSize, *timeout))
 }