tests: make benchmarks compile or disable those which don't compile

Reviewed-by: Jason McDonald Change-Id: Idc9fa4722b59f9b75d5e4a91bbfd0ae068d29b3d
2011-05-11 14:00:53 +10:00 · 2011-05-11 14:00:53 +10:00 · ce26a6fd2b
commit ce26a6fd2b
parent 427d32a3b8
13 changed files with 26 additions and 9 deletions
--- a/tests/benchmarks/corelib/io/io.pro
+++ b/tests/benchmarks/corelib/io/io.pro
@ -3,7 +3,7 @@ SUBDIRS = \
        qdir \
        qdiriterator \
        qfile \
-        qfileinfo \
+        #qfileinfo \    # FIXME: broken
        qiodevice \
        qtemporaryfile

--- a/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro
+++ b/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro
@ -6,6 +6,8 @@ INCLUDEPATH += .

 QT -= gui

+QT += core-private
+
 CONFIG += release

 # Input
--- a/tests/benchmarks/corelib/tools/qstring/qstring.pro
+++ b/tests/benchmarks/corelib/tools/qstring/qstring.pro
@ -1,6 +1,7 @@
 load(qttest_p4)
 TARGET = tst_bench_qstring
 QT -= gui
+QT += core-private
 SOURCES += main.cpp data.cpp fromlatin1.cpp fromutf8.cpp

 wince*:{
--- a/tests/benchmarks/dbus/qdbustype/qdbustype.pro
+++ b/tests/benchmarks/dbus/qdbustype/qdbustype.pro
@ -1,7 +1,7 @@
 load(qttest_p4)
 TARGET = tst_bench_qdbustype
 QT -= gui
-QT += dbus
+QT += dbus dbus-private
 QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
 LIBS_PRIVATE += $$QT_LIBS_DBUS

--- a/tests/benchmarks/gui/graphicsview/functional/functional.pro
+++ b/tests/benchmarks/gui/graphicsview/functional/functional.pro
@ -1,3 +1,4 @@
 TEMPLATE = subdirs
 SUBDIRS = \
-        GraphicsViewBenchmark
+        #GraphicsViewBenchmark  # FIXME: cannot be compiled by default as part of qtbase,
+                                # since it depends on qtsvg
--- a/tests/benchmarks/gui/graphicsview/graphicsview.pro
+++ b/tests/benchmarks/gui/graphicsview/graphicsview.pro
@ -3,7 +3,7 @@ SUBDIRS = \
        functional \
        qgraphicsanchorlayout \
        qgraphicsitem \
-        qgraphicslayout \
+        #qgraphicslayout \  # FIXME: broken
        qgraphicsscene \
        qgraphicsview \
        qgraphicswidget
--- a/tests/benchmarks/gui/image/qpixmap/qpixmap.pro
+++ b/tests/benchmarks/gui/image/qpixmap/qpixmap.pro
@ -1,4 +1,7 @@
 load(qttest_p4)
+
+QT += gui-private
+
 TEMPLATE = app
 TARGET = tst_bench_qpixmap

--- a/tests/benchmarks/gui/painting/qpainter/qpainter.pro
+++ b/tests/benchmarks/gui/painting/qpainter/qpainter.pro
@ -1,4 +1,7 @@
 load(qttest_p4)
+
+QT += gui-private
+
 TEMPLATE = app
 TARGET = tst_bench_qpainter

--- a/tests/benchmarks/gui/painting/qtracebench/qtracebench.pro
+++ b/tests/benchmarks/gui/painting/qtracebench/qtracebench.pro
@ -1,4 +1,7 @@
 load(qttest_p4)
+
+QT += core-private gui-private
+
 TEMPLATE = app
 TARGET = tst_qtracebench

--- a/tests/benchmarks/gui/text/qtext/qtext.pro
+++ b/tests/benchmarks/gui/text/qtext/qtext.pro
@ -1,4 +1,7 @@
 load(qttest_p4)
+
+QT += gui-private
+
 TEMPLATE = app
 TARGET = tst_bench_QText

--- a/tests/benchmarks/network/kernel/kernel.pro
+++ b/tests/benchmarks/network/kernel/kernel.pro
@ -1,3 +1,4 @@
 TEMPLATE = subdirs
-SUBDIRS = \
+
+contains(QT_CONFIG,private-tests):SUBDIRS += \
        qhostinfo
--- a/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro
+++ b/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro
@ -5,7 +5,7 @@ DEPENDPATH += .
 INCLUDEPATH += .

 QT -= gui
-QT += network
+QT += core-private network network-private

 CONFIG += release

--- a/tests/benchmarks/opengl/opengl.pro
+++ b/tests/benchmarks/opengl/opengl.pro
@ -4,7 +4,7 @@ TARGET = tst_bench_opengl
 DEPENDPATH += .
 INCLUDEPATH += .

-QT += opengl
+QT += core-private gui-private opengl opengl-private

 # Input
 SOURCES += main.cpp