diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-08-12 14:36:04 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-08-12 14:36:04 -0700 |
| commit | e6df6222accfc44c351f7dbaaf6a57ae1003881f (patch) | |
| tree | 968ddf91b34dbe1b5b2f845031f35a7670d9e180 /test/runner/defs.bzl | |
| parent | 00b684ea7fd96beb32d1517dd06c5d736621ff70 (diff) | |
| parent | 51e64d2fc590b0271d4e0cbbc75882cf81ada182 (diff) | |
Merge pull request #3250 from craig08:fuse-getattr
PiperOrigin-RevId: 326313858
Diffstat (limited to 'test/runner/defs.bzl')
| -rw-r--r-- | test/runner/defs.bzl | 45 |
1 files changed, 19 insertions, 26 deletions
diff --git a/test/runner/defs.bzl b/test/runner/defs.bzl index fa96b4ea2..2d64934b0 100644 --- a/test/runner/defs.bzl +++ b/test/runner/defs.bzl @@ -150,31 +150,12 @@ def syscall_test( if not tags: tags = [] - _syscall_test( - test = test, - shard_count = shard_count, - size = size, - platform = "native", - use_tmpfs = False, - add_uds_tree = add_uds_tree, - tags = list(tags), - ) - - for (platform, platform_tags) in platforms.items(): - _syscall_test( - test = test, - shard_count = shard_count, - size = size, - platform = platform, - use_tmpfs = use_tmpfs, - add_uds_tree = add_uds_tree, - tags = platform_tags + tags, - ) - vfs2_tags = list(tags) if vfs2: # Add tag to easily run VFS2 tests with --test_tag_filters=vfs2 vfs2_tags.append("vfs2") + if fuse: + vfs2_tags.append("fuse") else: # Don't automatically run tests tests not yet passing. @@ -191,19 +172,31 @@ def syscall_test( add_uds_tree = add_uds_tree, tags = platforms[default_platform] + vfs2_tags, vfs2 = True, + fuse = fuse, + ) + if fuse: + # Only generate *_vfs2_fuse target if fuse parameter is enabled. + return + + _syscall_test( + test = test, + shard_count = shard_count, + size = size, + platform = "native", + use_tmpfs = False, + add_uds_tree = add_uds_tree, + tags = list(tags), ) - if vfs2 and fuse: + for (platform, platform_tags) in platforms.items(): _syscall_test( test = test, shard_count = shard_count, size = size, - platform = default_platform, + platform = platform, use_tmpfs = use_tmpfs, add_uds_tree = add_uds_tree, - tags = platforms[default_platform] + vfs2_tags + ["fuse"], - vfs2 = True, - fuse = True, + tags = platform_tags + tags, ) # TODO(gvisor.dev/issue/1487): Enable VFS2 overlay tests. |