Merge branch 'master' into pr_syscall_linux

1 files changed, 33 insertions, 16 deletions

diff --git a/test/runtimes/BUILD b/test/runtimes/BUILD
index e85804a83..1cde74cfc 100644
--- a/test/runtimes/BUILD
+++ b/test/runtimes/BUILD
@@ -1,25 +1,42 @@
 # These packages are used to run language runtime tests inside gVisor sandboxes.
 
-load("@io_bazel_rules_go//go:def.bzl", "go_library")
-load("//runsc/test:build_defs.bzl", "runtime_test")
+load("@io_bazel_rules_go//go:def.bzl", "go_binary")
+load("//test/runtimes:build_defs.bzl", "runtime_test")
 
 package(licenses = ["notice"])
 
-go_library(
-    name = "runtimes",
-    srcs = ["runtimes.go"],
-    importpath = "gvisor.dev/gvisor/test/runtimes",
+go_binary(
+    name = "runner",
+    testonly = 1,
+    srcs = ["runner.go"],
+    deps = [
+        "//runsc/dockerutil",
+        "//runsc/testutil",
+    ],
 )
 
 runtime_test(
-    name = "runtimes_test",
-    size = "small",
-    srcs = ["runtimes_test.go"],
-    embed = [":runtimes"],
-    tags = [
-        # Requires docker and runsc to be configured before the test runs.
-        "manual",
-        "local",
-    ],
-    deps = ["//runsc/test/testutil"],
+    image = "gcr.io/gvisor-presubmit/go1.12",
+    lang = "go",
+)
+
+runtime_test(
+    image = "gcr.io/gvisor-presubmit/java11",
+    lang = "java",
+)
+
+runtime_test(
+    blacklist_file = "blacklist_nodejs12.4.0.csv",
+    image = "gcr.io/gvisor-presubmit/nodejs12.4.0",
+    lang = "nodejs",
+)
+
+runtime_test(
+    image = "gcr.io/gvisor-presubmit/php7.3.6",
+    lang = "php",
+)
+
+runtime_test(
+    image = "gcr.io/gvisor-presubmit/python3.7.3",
+    lang = "python",
 )