Wrap include of gtest.h and gmock.h with a warning-silencing pragma.

See https://github.com/google/googletest/issues/4701
The warnings cause the Arch Linux CI to fail because of -Werror.
pull/1909/merge
John Ralls 12 months ago
parent e00eade735
commit 3770cb8131

@ -29,7 +29,11 @@
#include <cstdint>
#include <Account.h>
#include <Split.h>
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gtest/gtest.h>
#pragma GCC diagnostic pop
static const int64_t DENOM = 100; //< Denominator is always 100 for simplicity.

@ -30,7 +30,11 @@
#include <Split.h>
#include <gnc-numeric.hpp>
#include <gnc-datetime.hpp>
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gtest/gtest.h>
#pragma GCC diagnostic pop
extern "C"
{
#include <gnc-pricedb-p.h>

@ -21,7 +21,11 @@
// #include "config.h"
#include "csv-export-helpers.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gtest/gtest.h>
#pragma GCC diagnostic pop
#include <sstream>

@ -22,7 +22,11 @@
* Boston, MA 02110-1301, USA gnu@gnu.org *
\********************************************************************/
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gtest/gtest.h>
#pragma GCC diagnostic pop
#include <config.h>

@ -28,7 +28,11 @@
#include "../gnc-tokenizer.hpp"
#include "../gnc-tokenizer-csv.hpp"
#include "../gnc-tokenizer-fw.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gtest/gtest.h>
#pragma GCC diagnostic pop
#include <iostream>
#include <fstream> // fstream

@ -26,7 +26,11 @@
#include "../gnc-tokenizer.hpp"
#include "../gnc-tokenizer-csv.hpp"
#include "../gnc-tokenizer-fw.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gtest/gtest.h>
#pragma GCC diagnostic pop
#include <iostream>
#include <fstream> // fstream

@ -22,7 +22,11 @@
* *
*******************************************************************/
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gtest/gtest.h>
#pragma GCC diagnostic pop
#include <config.h>
#include <import-account-matcher.h>
#include <gnc-session.h>

@ -22,7 +22,11 @@
\********************************************************************/
#include <gtk/gtk.h>
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gtest/gtest.h>
#pragma GCC diagnostic pop
#include <gmock/gmock.h>
#include <config.h>

@ -1,7 +1,11 @@
#ifndef GMOCK_GNC_PREFS_H
#define GMOCK_GNC_PREFS_H
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gmock/gmock.h>
#pragma GCC diagnostic pop
#include <gnc-prefs.h>

@ -38,8 +38,10 @@ gnc_default_currency(void)
return gnc_commodity_table_lookup(table, GNC_COMMODITY_NS_CURRENCY, "USD");
}
}
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gtest/gtest.h>
#pragma GCC diagnostic pop
#include "../gnc-quotes.cpp"
class GncMockQuoteSource final : public GncQuoteSource

@ -41,7 +41,10 @@
#include <gnc-engine.h>
#include <gnc-prefs.h>
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gtest/gtest.h>
#pragma GCC diagnostic pop
#include <unittest-support.h>
#include "../gnc-backend-xml.h"

@ -6,7 +6,10 @@
#include <binreloc.h>
#include <gnc-filepath-utils.h>
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gtest/gtest.h>
#pragma GCC diagnostic pop
/* Variant of EXPECT_STREQ that calls g_free()

@ -7,7 +7,11 @@
#ifndef FAKE_QOFQUERY_H
#define FAKE_QOFQUERY_H
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gmock/gmock.h>
#pragma GCC diagnostic pop
#include <qofquery.h>

@ -1,7 +1,11 @@
#ifndef GMOCK_ACCOUNT_H
#define GMOCK_ACCOUNT_H
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gmock/gmock.h>
#pragma GCC diagnostic pop
#include <Account.h>
#include <Account.hpp>

@ -1,7 +1,11 @@
#ifndef GMOCK_SPLIT_H
#define GMOCK_SPLIT_H
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gmock/gmock.h>
#pragma GCC diagnostic pop
#include <Split.h>
#include <SplitP.hpp>

@ -1,7 +1,11 @@
#ifndef GMOCK_TRANSACTION_H
#define GMOCK_TRANSACTION_H
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gmock/gmock.h>
#pragma GCC diagnostic pop
#include <Transaction.h>
#include <TransactionP.hpp>

@ -1,7 +1,11 @@
#ifndef GMOCK_QOFBOOK_H
#define GMOCK_QOFBOOK_H
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gmock/gmock.h>
#pragma GCC diagnostic pop
#include <qofbook.h>
#include <qofbook-p.h>

@ -1,6 +1,10 @@
#include <glib.h>
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gmock/gmock.h>
#pragma GCC diagnostic pop
#include <qofinstance.h>
#include <qofinstance-p.h>

@ -24,7 +24,10 @@
#include "../gnc-datetime.hpp"
#include "../gnc-date.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gtest/gtest.h>
#pragma GCC diagnostic pop
/* Backdoor to enable unittests to temporarily override the timezone: */
class TimeZoneProvider;

@ -20,7 +20,11 @@
* Boston, MA 02110-1301, USA gnu@gnu.org *
\********************************************************************/
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gtest/gtest.h>
#pragma GCC diagnostic pop
#include "../gnc-numeric.hpp"
#include <config.h>
#include "../gnc-euro.h"

@ -21,7 +21,11 @@
* *
*******************************************************************/
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gtest/gtest.h>
#pragma GCC diagnostic pop
#include <cstdint>
#include "../gnc-int128.hpp"

@ -20,7 +20,11 @@
* Boston, MA 02110-1301, USA gnu@gnu.org *
\********************************************************************/
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gtest/gtest.h>
#pragma GCC diagnostic pop
#include <cstdint>
#include "../gnc-numeric.hpp"
#include "../gnc-rational.hpp"

@ -21,7 +21,11 @@
* *
*******************************************************************/
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gtest/gtest.h>
#pragma GCC diagnostic pop
#include "gnc-option.hpp"
#include "gnc-option-impl.hpp"
#include "gnc-option-ui.hpp"

@ -21,7 +21,11 @@
* *
*******************************************************************/
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gtest/gtest.h>
#pragma GCC diagnostic pop
#include "gnc-optiondb.hpp"
#include "gnc-optiondb-impl.hpp"
#include "gnc-option-ui.hpp"

@ -21,7 +21,11 @@
* *
*******************************************************************/
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gtest/gtest.h>
#pragma GCC diagnostic pop
#include <random>
#include <cstdint>
#include "../gnc-rational.hpp"

@ -1,3 +1,4 @@
/********************************************************************
* Gtest-gnc-int128.cpp -- unit tests for the GncInt128 class *
* Copyright (C) 2014 John Ralls <jralls@ceridwen.us> *
@ -21,7 +22,11 @@
* *
*******************************************************************/
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gtest/gtest.h>
#pragma GCC diagnostic pop
#include <string>
#include "../gnc-timezone.hpp"

@ -26,7 +26,11 @@
#include <qofinstance-p.h>
#include <kvp-frame.hpp>
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gtest/gtest.h>
#pragma GCC diagnostic pop
#include <string>
#include <cstdint>

@ -27,7 +27,11 @@
#include "../test-core/test-engine-stuff.h"
#include "../qofevent.h"
#include "../qofevent-p.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gtest/gtest.h>
#pragma GCC diagnostic pop
static void
easy_handler (QofInstance *ent, QofEventId event_type,

@ -27,7 +27,11 @@
#include "../test-core/test-engine-stuff.h"
#include "../qofquerycore.h"
#include "../qofquerycore-p.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gtest/gtest.h>
#pragma GCC diagnostic pop
class QofQueryCoreTest : public ::testing::Test {

@ -29,7 +29,11 @@
#include <iomanip>
#include <string>
#include <iostream>
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gtest/gtest.h>
#pragma GCC diagnostic pop
TEST (GncGUID, creation)
{

@ -25,7 +25,11 @@
#include <guid.hpp>
#include "../kvp-value.hpp"
#include "../kvp-frame.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gtest/gtest.h>
#pragma GCC diagnostic pop
#include <algorithm>
#include <cstdint>

@ -29,7 +29,11 @@
#include "../gnc-date.h"
#include <memory>
#include <cstdint>
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gtest/gtest.h>
#pragma GCC diagnostic pop
TEST (KvpValueTest, Equality)
{

@ -22,7 +22,11 @@
* Boston, MA 02110-1301, USA gnu@gnu.org *
********************************************************************/
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcpp"
#include <gtest/gtest.h>
#pragma GCC diagnostic pop
#include "../guid.hpp"
#include <qofsession.hpp>
#include <qof-backend.hpp>

Loading…
Cancel
Save