summaryrefslogtreecommitdiffstats
path: root/tests/benchmarks/network
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/network
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/network')
-rw-r--r--tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro4
-rw-r--r--tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro4
-rw-r--r--tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro4
-rwxr-xr-xtests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro4
-rw-r--r--tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro4
-rw-r--r--tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro4
6 files changed, 24 insertions, 0 deletions
diff --git a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro
index 0949af790a..33e6923a6a 100644
--- a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro
+++ b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro
@@ -1,4 +1,8 @@
load(qttest_p4)
+
+# do not run benchmarks by default in 'make check'
+CONFIG -= testcase
+
TEMPLATE = app
TARGET = tst_bench_qfile_vs_qnetworkaccessmanager
DEPENDPATH += .
diff --git a/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro b/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro
index 7f665b332e..19cf771bcc 100644
--- a/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro
+++ b/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro
@@ -1,4 +1,8 @@
load(qttest_p4)
+
+# do not run benchmarks by default in 'make check'
+CONFIG -= testcase
+
TEMPLATE = app
TARGET = tst_bench_qnetworkdiskcache
DEPENDPATH += .
diff --git a/tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro b/tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro
index 9d96dc7025..de1487d489 100644
--- a/tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro
+++ b/tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro
@@ -1,4 +1,8 @@
load(qttest_p4)
+
+# do not run benchmarks by default in 'make check'
+CONFIG -= testcase
+
TEMPLATE = app
TARGET = tst_bench_qnetworkreply
DEPENDPATH += .
diff --git a/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro b/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro
index d456620d5a..42396b8cdb 100755
--- a/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro
+++ b/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro
@@ -1,4 +1,8 @@
load(qttest_p4)
+
+# do not run benchmarks by default in 'make check'
+CONFIG -= testcase
+
TEMPLATE = app
TARGET = tst_bench_qhostinfo
DEPENDPATH += .
diff --git a/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro b/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro
index e5b9346954..fc27158e17 100644
--- a/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro
+++ b/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro
@@ -1,4 +1,8 @@
load(qttest_p4)
+
+# do not run benchmarks by default in 'make check'
+CONFIG -= testcase
+
TEMPLATE = app
TARGET = tst_bench_qtcpserver
DEPENDPATH += .
diff --git a/tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro b/tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro
index da34a028d3..52a443f7f7 100644
--- a/tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro
+++ b/tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro
@@ -1,4 +1,8 @@
load(qttest_p4)
+
+# do not run benchmarks by default in 'make check'
+CONFIG -= testcase
+
TEMPLATE = app
TARGET = tst_bench_qsslsocket
DEPENDPATH += .