Support partitions for other tests.

PiperOrigin-RevId: 345399936

1 files changed, 4 insertions, 18 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)