From 3d1e44a677ecacbf81888211a93cef0a71c1c6c0 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Tue, 18 Jun 2019 01:40:12 -0700
Subject: gvisor/kokoro: don't modify tests names in the BUILD file

PiperOrigin-RevId: 253746380
---
 tools/run_tests.sh | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

(limited to 'tools')

diff --git a/tools/run_tests.sh b/tools/run_tests.sh
index 00b6b92b5..d1669b343 100755
--- a/tools/run_tests.sh
+++ b/tools/run_tests.sh
@@ -181,20 +181,24 @@ run_docker_tests() {
 
   # These names are used to exclude tests not supported in certain
   # configuration, e.g. save/restore not supported with hostnet.
-  declare -a variations=("" "-kvm" "-hostnet" "-overlay")
-  for v in "${variations[@]}"; do
-    # Change test names otherwise each run of tests will overwrite logs and
-    # results of the previous run.
-    sed -i "s/name = \"integration_test.*\"/name = \"integration_test${v}\"/" runsc/test/integration/BUILD
-    sed -i "s/name = \"image_test.*\"/name = \"image_test${v}\"/" runsc/test/image/BUILD
-    # Run runsc tests with docker that are tagged manual.
-    bazel test \
-      "${BAZEL_BUILD_FLAGS[@]}" \
-      --test_env=RUNSC_RUNTIME="${RUNTIME}${v}" \
-      --test_output=all \
-      //runsc/test/image:image_test${v} \
-      //runsc/test/integration:integration_test${v}
-  done
+  # Run runsc tests with docker that are tagged manual.
+  #
+  # The --nocache_test_results option is used here to eliminate cached results
+  # from the previous run for the runc runtime.
+  bazel test \
+    "${BAZEL_BUILD_FLAGS[@]}" \
+    --test_env=RUNSC_RUNTIME="${RUNTIME}" \
+    --test_output=all \
+    --nocache_test_results \
+    --test_output=streamed \
+    //runsc/test/integration:integration_test \
+    //runsc/test/integration:integration_test_hostnet \
+    //runsc/test/integration:integration_test_overlay \
+    //runsc/test/integration:integration_test_kvm \
+    //runsc/test/image:image_test \
+    //runsc/test/image:image_test_overlay \
+    //runsc/test/image:image_test_hostnet \
+    //runsc/test/image:image_test_kvm
 }
 
 # Run the tests that require root.
-- 
cgit v1.2.3