From 4c9b3c840df3baf5145d73ecb994ba24b87908c7 Mon Sep 17 00:00:00 2001 From: Alessio Bazzica Date: Wed, 4 Apr 2018 14:09:55 +0000 Subject: [PATCH] Reland "Adding gtest-spi.h in webrtc/test/gtest.h" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 27e8a3e223098a023c3b2a0cb3c3ee9268b1cc63. Reason for revert: A CL to make downstream projects compatible has landend. Original change's description: > Revert "Adding gtest-spi.h in webrtc/test/gtest.h" > > This reverts commit 68f4904ac972fc75e81b642da4d2f46efe79071b. > > Reason for revert: Breaks downstream projects. > > Original change's description: > > Adding gtest-spi.h in webrtc/test/gtest.h > > > > The additional include is needed in order to use EXPECT_NONFATAL_FAILURE() > > in unit tests. > > > > Bug: webrtc:8948 > > Change-Id: If5b9ceb89a3a36480657d094cfabc81c9b0e15b7 > > Reviewed-on: https://webrtc-review.googlesource.com/58096 > > Reviewed-by: Mirko Bonadei > > Reviewed-by: Patrik Höglund > > Commit-Queue: Alessio Bazzica > > Cr-Commit-Position: refs/heads/master@{#22227} > > TBR=phoglund@webrtc.org,mbonadei@webrtc.org,alessiob@webrtc.org > > Change-Id: Id74c6563e1b8ac637667b5fb8777bbd6b7c8f5d0 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:8948 > Reviewed-on: https://webrtc-review.googlesource.com/58881 > Reviewed-by: Philip Eliasson > Commit-Queue: Philip Eliasson > Cr-Commit-Position: refs/heads/master@{#22232} TBR=phoglund@webrtc.org,mbonadei@webrtc.org,alessiob@webrtc.org,philipel@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:8948 Change-Id: Ib8072ab3d508ae82f557306f3519c5bb00b37b25 Reviewed-on: https://webrtc-review.googlesource.com/66840 Reviewed-by: Alessio Bazzica Reviewed-by: Patrik Höglund Commit-Queue: Alessio Bazzica Cr-Commit-Position: refs/heads/master@{#22742} --- test/gtest.h | 1 + 1 file changed, 1 insertion(+) diff --git a/test/gtest.h b/test/gtest.h index 928ec496f0..fa4396420e 100644 --- a/test/gtest.h +++ b/test/gtest.h @@ -14,6 +14,7 @@ #include "rtc_base/ignore_wundef.h" RTC_PUSH_IGNORING_WUNDEF() +#include "testing/gtest/include/gtest/gtest-spi.h" #include "testing/gtest/include/gtest/gtest.h" RTC_POP_IGNORING_WUNDEF()