From 28b3bd33ce9bc46dedbfc2e411461b199f4765bd Mon Sep 17 00:00:00 2001 From: Thomas Van Lenten Date: Thu, 6 Jan 2022 12:52:07 -0800 Subject: [PATCH] Add name arguments to the test suites. Silences the buildifier warning, but also provides an name so tools like buildozer that work on the AST can better handle the BUILD files where they are called. RELNOTES: None PiperOrigin-RevId: 420123866 (cherry picked from commit 14b8cfcc4956e2c38f66f855783cbeccec2bd6f3) --- test/BUILD | 20 ++++++++++---------- test/ast_file_tests.bzl | 4 ++-- test/coverage_settings_tests.bzl | 4 ++-- test/debug_settings_tests.bzl | 4 ++-- test/generated_header_tests.bzl | 4 ++-- test/module_cache_settings_tests.bzl | 4 ++-- test/output_file_map_tests.bzl | 4 ++-- test/pch_output_dir_tests.bzl | 4 ++-- test/private_deps_tests.bzl | 4 ++-- test/split_derived_files_tests.bzl | 4 ++-- test/swift_through_non_swift_tests.bzl | 4 ++-- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/test/BUILD b/test/BUILD index 7f9c5460f..7bb19034a 100644 --- a/test/BUILD +++ b/test/BUILD @@ -12,25 +12,25 @@ load(":pch_output_dir_tests.bzl", "pch_output_dir_test_suite") licenses(["notice"]) -ast_file_test_suite() +ast_file_test_suite(name = "ast_file") -coverage_settings_test_suite() +coverage_settings_test_suite(name = "coverage_settings") -debug_settings_test_suite() +debug_settings_test_suite(name = "debug_settings") -generated_header_test_suite() +generated_header_test_suite(name = "generated_header") -module_cache_settings_test_suite() +module_cache_settings_test_suite(name = "module_cache_settings") -output_file_map_test_suite() +output_file_map_test_suite(name = "output_file_map") -private_deps_test_suite() +private_deps_test_suite(name = "private_deps") -swift_through_non_swift_test_suite() +swift_through_non_swift_test_suite(name = "swift_through_non_swift") -split_derived_files_test_suite() +split_derived_files_test_suite(name = "split_derived_files") -pch_output_dir_test_suite() +pch_output_dir_test_suite(name = "pch_output_dir_settings") test_suite( name = "all_tests", diff --git a/test/ast_file_tests.bzl b/test/ast_file_tests.bzl index ecbc1ffe7..03902f67d 100644 --- a/test/ast_file_tests.bzl +++ b/test/ast_file_tests.bzl @@ -19,11 +19,11 @@ load( "provider_test", ) -def ast_file_test_suite(name = "ast_file"): +def ast_file_test_suite(name): """Test suite for `swift_library` dumping ast files. Args: - name: The name prefix for all the nested tests + name: the base name to be used in things created by this macro """ provider_test( diff --git a/test/coverage_settings_tests.bzl b/test/coverage_settings_tests.bzl index b14e58234..2e6684f02 100644 --- a/test/coverage_settings_tests.bzl +++ b/test/coverage_settings_tests.bzl @@ -30,11 +30,11 @@ coverage_xcode_prefix_map_test = make_action_command_line_test_rule( }, ) -def coverage_settings_test_suite(name = "coverage_settings"): +def coverage_settings_test_suite(name): """Test suite for coverage options. Args: - name: The name prefix for all the nested tests + name: the base name to be used in things created by this macro """ default_coverage_test( name = "{}_default_coverage".format(name), diff --git a/test/debug_settings_tests.bzl b/test/debug_settings_tests.bzl index 49d5a61d6..73d9085dc 100644 --- a/test/debug_settings_tests.bzl +++ b/test/debug_settings_tests.bzl @@ -100,11 +100,11 @@ xcode_remap_command_line_test = make_action_command_line_test_rule( }, ) -def debug_settings_test_suite(name = "debug_settings"): +def debug_settings_test_suite(name): """Test suite for serializing debugging options. Args: - name: The name prefix for all the nested tests + name: the base name to be used in things created by this macro """ # Verify that `-c dbg` builds serialize debugging options, remap paths, and diff --git a/test/generated_header_tests.bzl b/test/generated_header_tests.bzl index 8a9903e92..e00f1a750 100644 --- a/test/generated_header_tests.bzl +++ b/test/generated_header_tests.bzl @@ -23,11 +23,11 @@ load( "provider_test", ) -def generated_header_test_suite(name = "generated_header"): +def generated_header_test_suite(name): """Test suite for `swift_library` generated headers. Args: - name: The name prefix for all the nested tests + name: the base name to be used in things created by this macro """ # Verify that the generated header by default gets an automatically diff --git a/test/module_cache_settings_tests.bzl b/test/module_cache_settings_tests.bzl index da5cde047..35516581b 100644 --- a/test/module_cache_settings_tests.bzl +++ b/test/module_cache_settings_tests.bzl @@ -44,11 +44,11 @@ incorrect_global_module_cache_uses_tmpdir_action_command_line_test = make_action }, ) -def module_cache_settings_test_suite(name = "module_cache_settings"): +def module_cache_settings_test_suite(name): """Test suite for module cache options. Args: - name: The name prefix for all the nested tests + name: the base name to be used in things created by this macro """ # Verify that a global module cache path is passed to swiftc. diff --git a/test/output_file_map_tests.bzl b/test/output_file_map_tests.bzl index f69533717..76cba536d 100644 --- a/test/output_file_map_tests.bzl +++ b/test/output_file_map_tests.bzl @@ -39,11 +39,11 @@ output_file_map_embed_bitcode_wmo_test = make_output_file_map_test_rule( }, ) -def output_file_map_test_suite(name = "output_file_map"): +def output_file_map_test_suite(name): """Test suite for `swift_library` generating output file maps. Args: - name: The name prefix for all the nested tests + name: the base name to be used in things created by this macro """ output_file_map_test( diff --git a/test/pch_output_dir_tests.bzl b/test/pch_output_dir_tests.bzl index 05c113117..e542c22d8 100644 --- a/test/pch_output_dir_tests.bzl +++ b/test/pch_output_dir_tests.bzl @@ -27,11 +27,11 @@ pch_output_dir_action_command_line_test = make_action_command_line_test_rule( }, ) -def pch_output_dir_test_suite(name = "pch_output_dir_settings"): +def pch_output_dir_test_suite(name): """Test suite for pch output dir options. Args: - name: The name prefix for all the nested tests + name: the base name to be used in things created by this macro """ # Verify that a pch dir is passed diff --git a/test/private_deps_tests.bzl b/test/private_deps_tests.bzl index 6085f5e96..1a8c9f5a9 100644 --- a/test/private_deps_tests.bzl +++ b/test/private_deps_tests.bzl @@ -27,11 +27,11 @@ private_deps_provider_test = make_provider_test_rule( }, ) -def private_deps_test_suite(name = "private_deps"): +def private_deps_test_suite(name): """Test suite for propagation behavior of `swift_library.private_deps`. Args: - name: The name prefix for all the nested tests + name: the base name to be used in things created by this macro """ # Each of the two leaf libraries should propagate their own modules. diff --git a/test/split_derived_files_tests.bzl b/test/split_derived_files_tests.bzl index de639e4e6..e6261058d 100644 --- a/test/split_derived_files_tests.bzl +++ b/test/split_derived_files_tests.bzl @@ -94,11 +94,11 @@ split_swiftmodule_copts_test = make_action_command_line_test_rule( }, ) -def split_derived_files_test_suite(name = "split_derived_files"): +def split_derived_files_test_suite(name): """Test suite for split derived files options. Args: - name: The name prefix for all the nested tests + name: the base name to be used in things created by this macro """ default_no_split_test( name = "{}_default_no_split_args".format(name), diff --git a/test/swift_through_non_swift_tests.bzl b/test/swift_through_non_swift_tests.bzl index 92b31fb8e..3b6114639 100644 --- a/test/swift_through_non_swift_tests.bzl +++ b/test/swift_through_non_swift_tests.bzl @@ -19,11 +19,11 @@ load( "provider_test", ) -def swift_through_non_swift_test_suite(name = "swift_through_non_swift"): +def swift_through_non_swift_test_suite(name): """Test suite for propagation of `SwiftInfo` through non-Swift targets. Args: - name: The name prefix for all the nested tests + name: the base name to be used in things created by this macro """ # The lower swiftmodule should get propagated through the `objc_library` (by