Commit e2d18679 authored by Tim Van Patten's avatar Tim Van Patten Committed by Commit Bot

Exclude memory_test compilation on Windows

The memory_test target fails to build on Windows due to a variety of
errors related to MOCK_METHOD(). For example:

    memory_test.cc(542,3): error: static_assert failed "(size_t) should
    be enclosed in parentheses."

This is generated by the line:
    MOCK_METHOD(value_type*, allocate, (size_t));

"(size_t)" is clearly enclosed by parentheses (the error message even
indicates this), but both clang and MSVC fail to compile correctly on
Windows due to these errors.

Bug: angleproject:4873
Bug: 1116473
Test: Build on Windows and Linux
Change-Id: Ie83e7f2ebcdbd641b9e87ac7de7ef28f19b0bbac
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2353403Reviewed-by: default avatarJamie Madill <jmadill@chromium.org>
Reviewed-by: default avatarMirko Bonadei <mbonadei@chromium.org>
Commit-Queue: Tim Van Patten <timvp@google.com>
Cr-Commit-Position: refs/heads/master@{#798249}
parent f88a86cf
......@@ -14,11 +14,16 @@ absl_source_set("memory") {
absl_source_set("memory_test") {
testonly = true
sources = [ "memory_test.cc" ]
deps = [
":memory",
"//third_party/abseil-cpp/absl/base:core_headers",
"//third_party/googletest:gtest",
"//third_party/googletest:gmock",
]
# TODO(https://crbug.com/1116473): memory_test.cc fails to build in
# standalone ANGLE on Windows
if (!build_with_chromium && !is_win) {
sources = [ "memory_test.cc" ]
deps = [
":memory",
"//third_party/abseil-cpp/absl/base:core_headers",
"//third_party/googletest:gmock",
"//third_party/googletest:gtest",
]
}
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment