From 389d64ec33b3eee60b26b3396d1e66b527e764f1 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 29 Aug 2014 16:28:49 +0200 Subject: [PATCH] Debugger: Disable some boost usage in autotest Breaks some setups and is not that important anyway. Change-Id: Ic5d324445c2a2f12a7f6c2a4b52b51e3a2567c95 Reviewed-by: Erik Verbruggen --- tests/auto/debugger/offsets.pro | 9 +++++++++ tests/auto/debugger/tst_offsets.cpp | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/tests/auto/debugger/offsets.pro b/tests/auto/debugger/offsets.pro index 8e650e7c5b6..bee697ecffc 100644 --- a/tests/auto/debugger/offsets.pro +++ b/tests/auto/debugger/offsets.pro @@ -4,4 +4,13 @@ include(../../../src/private_headers.pri) QT += core-private +exists(/usr/include/boost/unordered/unordered_set.hpp) { + DEFINES += HAS_BOOST +} + +exists(/usr/local/include/boost/unordered/unordered_set.hpp) { + DEFINES += HAS_BOOST + INCLUDEPATH += /usr/local/include +} + SOURCES += tst_offsets.cpp diff --git a/tests/auto/debugger/tst_offsets.cpp b/tests/auto/debugger/tst_offsets.cpp index ffbe17b327f..e685a4f0495 100644 --- a/tests/auto/debugger/tst_offsets.cpp +++ b/tests/auto/debugger/tst_offsets.cpp @@ -38,7 +38,9 @@ #include #include +#ifdef HAS_BOOST #include +#endif class tst_offsets : public QObject { @@ -189,6 +191,7 @@ void tst_offsets::offsets_data() #endif } +#ifdef HAS_BOOST { boost::unordered::unordered_set *p = 0; @@ -199,6 +202,7 @@ void tst_offsets::offsets_data() QTest::newRow("boost::unordered::unordered_set::buckets_") << int((char *)&p->table_.buckets_ - (char *)p) << 20 << 40; } +#endif }