summaryrefslogtreecommitdiffstats
path: root/tests/benchmarks/dbus
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2011-07-19 09:45:08 +1000
committerQt by Nokia <qt-info@nokia.com>2011-07-19 13:11:37 +0200
commit04da81e9a2b713571429dc01066727b90ef2b651 (patch)
tree0941deb976caae0600f38fce88a8e1a382d26cdf /tests/benchmarks/dbus
parent3cc0cf31bd6fac92fb84ee711a04391f4d6b414b (diff)
tests: do not run benchmarks by default in 'make check'
`make check' is intended primarily for running functional tests. For the most part, it does not make sense to run benchmarks in the same test environment as the functional tests. Also, the runtime for some of these benchmarks is quite long, and some of them share the same name as existing functional tests. These are problematic. Change-Id: I2ca4cfa24c73280a0b73e51423007eaff92085b8 Reviewed-on: http://codereview.qt.nokia.com/1794 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/benchmarks/dbus')
-rw-r--r--tests/benchmarks/dbus/qdbusperformance/qdbusperformance.pro1
-rw-r--r--tests/benchmarks/dbus/qdbusperformance/test/test.pro4
-rw-r--r--tests/benchmarks/dbus/qdbustype/qdbustype.pro4
3 files changed, 8 insertions, 1 deletions
diff --git a/tests/benchmarks/dbus/qdbusperformance/qdbusperformance.pro b/tests/benchmarks/dbus/qdbusperformance/qdbusperformance.pro
index 90f88a70ec..e90d38a55c 100644
--- a/tests/benchmarks/dbus/qdbusperformance/qdbusperformance.pro
+++ b/tests/benchmarks/dbus/qdbusperformance/qdbusperformance.pro
@@ -1,4 +1,3 @@
-load(qttest_p4)
TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS = server test
diff --git a/tests/benchmarks/dbus/qdbusperformance/test/test.pro b/tests/benchmarks/dbus/qdbusperformance/test/test.pro
index 9f5712e9e2..14ecee8339 100644
--- a/tests/benchmarks/dbus/qdbusperformance/test/test.pro
+++ b/tests/benchmarks/dbus/qdbusperformance/test/test.pro
@@ -1,4 +1,8 @@
load(qttest_p4)
+
+# do not run benchmarks by default in 'make check'
+CONFIG -= testcase
+
SOURCES += ../tst_qdbusperformance.cpp
HEADERS += ../serverobject.h
TARGET = ../tst_qdbusperformance
diff --git a/tests/benchmarks/dbus/qdbustype/qdbustype.pro b/tests/benchmarks/dbus/qdbustype/qdbustype.pro
index 2f3edf074b..325712edde 100644
--- a/tests/benchmarks/dbus/qdbustype/qdbustype.pro
+++ b/tests/benchmarks/dbus/qdbustype/qdbustype.pro
@@ -1,4 +1,8 @@
load(qttest_p4)
+
+# do not run benchmarks by default in 'make check'
+CONFIG -= testcase
+
TARGET = tst_bench_qdbustype
QT -= gui
QT += dbus dbus-private