summaryrefslogtreecommitdiffstats
path: root/tools/clang
diff options
context:
space:
mode:
authorthakis <thakis@chromium.org>2016-03-10 07:12:06 -0800
committerCommit bot <commit-bot@chromium.org>2016-03-10 15:13:56 +0000
commit1ae6a023e6165754ab7d9e8f5a9ed11c4e42eac8 (patch)
tree81f3dd5d8c284c0621b055c37e6d3be303030e85 /tools/clang
parent4805f933d6a3209f466cfcfeaf550b2dd011f051 (diff)
downloadchromium_src-1ae6a023e6165754ab7d9e8f5a9ed11c4e42eac8.zip
chromium_src-1ae6a023e6165754ab7d9e8f5a9ed11c4e42eac8.tar.gz
chromium_src-1ae6a023e6165754ab7d9e8f5a9ed11c4e42eac8.tar.bz2
Revert of Fix tests for check-ipc Clang plugin to pass on Windows. (patchset #2 id:20001 of https://codereview.chromium.org/1785523002/ )
Reason for revert: IPC plugin tests are failing on the clang/tot win bots. Original issue's description: > Fix tests for check-ipc Clang plugin to pass on Windows. > > Add -fno-delayed-template-parsing to disable MSVC-like behavior (check-ipc > will only be used on Android, the only platform where we need 32/64-bit > processes to talk to each other), remove test that relies on size_t being > unsigned long. > > BUG=581409 > > Committed: https://crrev.com/b9d266457c4b0b619304c99a28fce037be7b0507 > Cr-Commit-Position: refs/heads/master@{#380271} TBR=dcheng@chromium.org,hans@chromium.org,dskiba@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=581409 Review URL: https://codereview.chromium.org/1778383002 Cr-Commit-Position: refs/heads/master@{#380407}
Diffstat (limited to 'tools/clang')
-rw-r--r--tools/clang/plugins/tests/ipc.cpp10
-rw-r--r--tools/clang/plugins/tests/ipc.flags2
-rw-r--r--tools/clang/plugins/tests/ipc.txt17
3 files changed, 15 insertions, 14 deletions
diff --git a/tools/clang/plugins/tests/ipc.cpp b/tools/clang/plugins/tests/ipc.cpp
index d2bcef1..0347e1c 100644
--- a/tools/clang/plugins/tests/ipc.cpp
+++ b/tools/clang/plugins/tests/ipc.cpp
@@ -202,7 +202,7 @@ IPC_TEST_MESSAGE(__COUNTER__, (char, short, std::pair<size_t, bool>)) // ERROR
IPC_TEST_MESSAGE(__COUNTER__, (std::vector<std::vector<long&>&>&)) // ERROR
-/* Check IPC::WriteParam() arguments. ERRORS: 30 */
+/* Check IPC::WriteParam() arguments. ERRORS: 31 */
// ERRORS: 21
void TestWriteParamArgument() {
@@ -305,7 +305,7 @@ struct Provider {
std::vector<uint64_t> uint64s_data;
};
-// ERRORS: 9
+// ERRORS: 10
void TestWriteParamMemberArgument() {
Provider p;
@@ -325,9 +325,7 @@ void TestWriteParamMemberArgument() {
IPC::WriteParam(nullptr, p.get_long()); // ERROR
IPC::WriteParam(nullptr, p.long_data); // ERROR
- // This one is flaky and depends on whether size_t is typedefed to a
- // blacklisted type (unsigned long).
- //IPC::WriteParam(nullptr, p.get<size_t>()); // ERROR
+ IPC::WriteParam(nullptr, p.get<size_t>()); // ERROR
IPC::WriteParam(nullptr, p.get_size()); // ERROR
IPC::WriteParam(nullptr, p.size_data); // ERROR
@@ -350,4 +348,4 @@ void TestWriteParamMemberArgument() {
}
-/* ERRORS: 41 */
+/* ERRORS: 42 */
diff --git a/tools/clang/plugins/tests/ipc.flags b/tools/clang/plugins/tests/ipc.flags
index 33926b6..49716d6 100644
--- a/tools/clang/plugins/tests/ipc.flags
+++ b/tools/clang/plugins/tests/ipc.flags
@@ -1 +1 @@
--ferror-limit=0 -Xclang -plugin-arg-find-bad-constructs -Xclang check-ipc -fno-delayed-template-parsing \ No newline at end of file
+-ferror-limit=0 -Xclang -plugin-arg-find-bad-constructs -Xclang check-ipc \ No newline at end of file
diff --git a/tools/clang/plugins/tests/ipc.txt b/tools/clang/plugins/tests/ipc.txt
index fbca40b..07e260b 100644
--- a/tools/clang/plugins/tests/ipc.txt
+++ b/tools/clang/plugins/tests/ipc.txt
@@ -203,22 +203,25 @@ ipc.cpp:325:28: error: [chromium-ipc] IPC::WriteParam() is called on blacklisted
ipc.cpp:326:30: error: [chromium-ipc] IPC::WriteParam() is called on blacklisted type 'long'.
IPC::WriteParam(nullptr, p.long_data); // ERROR
^
-ipc.cpp:331:28: error: [chromium-ipc] IPC::WriteParam() is called on blacklisted type 'size_t'.
+ipc.cpp:328:28: error: [chromium-ipc] IPC::WriteParam() is called on blacklisted type 'unsigned long'.
+ IPC::WriteParam(nullptr, p.get<size_t>()); // ERROR
+ ^
+ipc.cpp:329:28: error: [chromium-ipc] IPC::WriteParam() is called on blacklisted type 'size_t'.
IPC::WriteParam(nullptr, p.get_size()); // ERROR
^
-ipc.cpp:332:30: error: [chromium-ipc] IPC::WriteParam() is called on blacklisted type 'size_t'.
+ipc.cpp:330:30: error: [chromium-ipc] IPC::WriteParam() is called on blacklisted type 'size_t'.
IPC::WriteParam(nullptr, p.size_data); // ERROR
^
-ipc.cpp:336:28: error: [chromium-ipc] IPC::WriteParam() is called on blacklisted type 'unsigned long'.
+ipc.cpp:334:28: error: [chromium-ipc] IPC::WriteParam() is called on blacklisted type 'unsigned long'.
IPC::WriteParam(nullptr, p.get<uint64_t>()); // ERROR
^
-ipc.cpp:341:28: error: [chromium-ipc] IPC::WriteParam() is called on blacklisted type 'unsigned long' via 'struct std::vector<unsigned long, struct std::allocator<unsigned long> >'.
+ipc.cpp:339:28: error: [chromium-ipc] IPC::WriteParam() is called on blacklisted type 'unsigned long' via 'struct std::vector<unsigned long, struct std::allocator<unsigned long> >'.
IPC::WriteParam(nullptr, p.get<std::vector<uint64_t>>()); // ERROR
^
-ipc.cpp:348:28: error: [chromium-ipc] IPC::WriteParam() is called on blacklisted type 'size_t' via 'std::vector<size_t>'.
+ipc.cpp:346:28: error: [chromium-ipc] IPC::WriteParam() is called on blacklisted type 'size_t' via 'std::vector<size_t>'.
IPC::WriteParam(nullptr, p.get_sizes()); // ERROR
^
-ipc.cpp:349:30: error: [chromium-ipc] IPC::WriteParam() is called on blacklisted type 'size_t' via 'std::vector<size_t>'.
+ipc.cpp:347:30: error: [chromium-ipc] IPC::WriteParam() is called on blacklisted type 'size_t' via 'std::vector<size_t>'.
IPC::WriteParam(nullptr, p.sizes_data); // ERROR
^
-41 errors generated.
+42 errors generated.