From 80552b936d06e43ea77df09a6b6c5ce2600a6f6a Mon Sep 17 00:00:00 2001
From: Adin Scannell <ascannell@google.com>
Date: Thu, 3 Dec 2020 00:58:36 -0800
Subject: Support partitions for other tests.

PiperOrigin-RevId: 345399936
---
 test/packetdrill/defs.bzl            |  6 ++----
 test/packetdrill/packetdrill_test.sh | 13 +++++++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'test/packetdrill')

diff --git a/test/packetdrill/defs.bzl b/test/packetdrill/defs.bzl
index fc28ce9ba..a6cbcc376 100644
--- a/test/packetdrill/defs.bzl
+++ b/test/packetdrill/defs.bzl
@@ -15,7 +15,7 @@ def _packetdrill_test_impl(ctx):
         # Make sure that everything is readable here.
         "find . -type f -exec chmod a+rx {} \\;",
         "find . -type d -exec chmod a+rx {} \\;",
-        "%s %s --init_script %s $@ -- %s\n" % (
+        "%s %s --init_script %s \"$@\" -- %s\n" % (
             test_runner.short_path,
             " ".join(ctx.attr.flags),
             ctx.files._init_script[0].short_path,
@@ -80,9 +80,7 @@ def packetdrill_netstack_test(name, **kwargs):
         kwargs["tags"] = PACKETDRILL_TAGS
     _packetdrill_test(
         name = name,
-        # This is the default runtime unless
-        # "--test_arg=--runtime=OTHER_RUNTIME" is used to override the value.
-        flags = ["--dut_platform", "netstack", "--runtime", "runsc-d"],
+        flags = ["--dut_platform", "netstack"],
         **kwargs
     )
 
diff --git a/test/packetdrill/packetdrill_test.sh b/test/packetdrill/packetdrill_test.sh
index 922547d65..d25cad83a 100755
--- a/test/packetdrill/packetdrill_test.sh
+++ b/test/packetdrill/packetdrill_test.sh
@@ -29,7 +29,7 @@ function failure() {
 }
 trap 'failure ${LINENO} "$BASH_COMMAND"' ERR
 
-declare -r LONGOPTS="dut_platform:,init_script:,runtime:"
+declare -r LONGOPTS="dut_platform:,init_script:,runtime:,partition:,total_partitions:"
 
 # Don't use declare below so that the error from getopt will end the script.
 PARSED=$(getopt --options "" --longoptions=$LONGOPTS --name "$0" -- "$@")
@@ -48,12 +48,17 @@ while true; do
       shift 2
       ;;
     --runtime)
-      # Not readonly because there might be multiple --runtime arguments and we
-      # want to use just the last one.  Only used if --dut_platform is
-      # "netstack".
       declare RUNTIME="$2"
       shift 2
       ;;
+    --partition)
+      # Ignored.
+      shift 2
+      ;;
+    --total_partitions)
+      # Ignored.
+      shift 2
+      ;;
     --)
       shift
       break
-- 
cgit v1.2.3