From 68ec24098221567237af9b5404e72f0ad7194f47 Mon Sep 17 00:00:00 2001 From: Etienne Perot Date: Tue, 7 Jun 2022 16:40:13 -0700 Subject: [PATCH] Disable tests for platforms tagged with "internal". PiperOrigin-RevId: 453554360 --- runsc/boot/platforms/BUILD | 1 + test/runner/defs.bzl | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/runsc/boot/platforms/BUILD b/runsc/boot/platforms/BUILD index 2729e7089..d45ab4674 100644 --- a/runsc/boot/platforms/BUILD +++ b/runsc/boot/platforms/BUILD @@ -22,6 +22,7 @@ exempt_go_library( linux = [ "//pkg/sentry/platform/%s" % platform for platform in platforms + if "internal" not in platforms[platform] ], ), ) diff --git a/test/runner/defs.bzl b/test/runner/defs.bzl index 85ecaeea9..299ee92c4 100644 --- a/test/runner/defs.bzl +++ b/test/runner/defs.bzl @@ -148,6 +148,12 @@ def _syscall_test( **kwargs ) +def all_platforms(): + """All platforms returns a list of all platforms.""" + available = dict(platforms.items()) + available[default_platform] = platforms.get(default_platform, []) + return available.items() + def syscall_test( test, use_tmpfs = False, @@ -190,7 +196,7 @@ def syscall_test( **kwargs ) - for (platform, platform_tags) in platforms.items(): + for platform, platform_tags in all_platforms(): _syscall_test( test = test, platform = platform, @@ -221,7 +227,7 @@ def syscall_test( platform = default_platform, use_tmpfs = use_tmpfs, add_uds_tree = add_uds_tree, - tags = platforms[default_platform] + tags, + tags = platforms.get(default_platform, []) + tags, debug = debug, fuse = fuse, overlay = True, @@ -234,7 +240,7 @@ def syscall_test( use_tmpfs = use_tmpfs, network = "host", add_uds_tree = add_uds_tree, - tags = platforms[default_platform] + tags, + tags = platforms.get(default_platform, []) + tags, debug = debug, fuse = fuse, **kwargs @@ -246,7 +252,7 @@ def syscall_test( platform = default_platform, use_tmpfs = use_tmpfs, add_uds_tree = add_uds_tree, - tags = platforms[default_platform] + tags, + tags = platforms.get(default_platform, []) + tags, debug = debug, file_access = "shared", fuse = fuse,