From 0552b2180a97d7630336082bfeb5f55cbc9b070e Mon Sep 17 00:00:00 2001 From: MichealReed Date: Fri, 16 Aug 2024 18:20:12 +0000 Subject: [PATCH] Add googletest to python deps script Without this dependency, automated builds will error since the third_party/googletest folder does not have a CMakeLists.txt or is required somewhere and should not be. This is an imported pull request from https://github.com/google/dawn/pull/20 GITHUB_PR_HEAD_SHA=3c4eed2eb3d1fa06ffdea2eb7be63529269a1b05 ORIGINAL_AUTHOR=MichealReed GitOrigin-RevId: f262db96feba4918d36e40ba748bf803391aaa38 Change-Id: Ifde416b3c4bd016024d9993aab777a697e2f6128 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/201818 Commit-Queue: Austin Eng Reviewed-by: Austin Eng --- tools/fetch_dawn_dependencies.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/fetch_dawn_dependencies.py b/tools/fetch_dawn_dependencies.py index 3199c006c9c..b5594dea6e0 100644 --- a/tools/fetch_dawn_dependencies.py +++ b/tools/fetch_dawn_dependencies.py @@ -88,7 +88,7 @@ action='store_true', default=False, help=""" - Fetch dependencies needed for testing + Deprecated: Test dependencies are now always included. """) @@ -108,17 +108,16 @@ def main(args): 'third_party/markupsafe', 'third_party/glslang/src', 'third_party/google_benchmark/src', + 'third_party/googletest', 'third_party/spirv-headers/src', 'third_party/spirv-tools/src', 'third_party/vulkan-headers/src', 'third_party/vulkan-loader/src', 'third_party/vulkan-utility-libraries/src', ] - if args.use_test_deps: - required_submodules += [ - 'third_party/googletest', - ] + log("""WARNING: --use-test-deps argument deprecated. + Test dependencies are now always included.""") root_dir = Path(args.directory).resolve()