summaryrefslogtreecommitdiffstats
path: root/tests/benchmarks/gui/image
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/gui/image
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/gui/image')
-rw-r--r--tests/benchmarks/gui/image/blendbench/blendbench.pro4
-rw-r--r--tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro4
-rw-r--r--tests/benchmarks/gui/image/qimagereader/qimagereader.pro4
-rw-r--r--tests/benchmarks/gui/image/qpixmap/qpixmap.pro3
-rw-r--r--tests/benchmarks/gui/image/qpixmapcache/qpixmapcache.pro4
5 files changed, 19 insertions, 0 deletions
diff --git a/tests/benchmarks/gui/image/blendbench/blendbench.pro b/tests/benchmarks/gui/image/blendbench/blendbench.pro
index aa6ab95e11..0f3c9804ae 100644
--- a/tests/benchmarks/gui/image/blendbench/blendbench.pro
+++ b/tests/benchmarks/gui/image/blendbench/blendbench.pro
@@ -1,4 +1,8 @@
load(qttest_p4)
+
+# do not run benchmarks by default in 'make check'
+CONFIG -= testcase
+
TEMPLATE = app
TARGET = tst_bench_blendbench
DEPENDPATH += .
diff --git a/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro b/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro
index ec50d98c54..2aefe2422b 100644
--- a/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro
+++ b/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro
@@ -1,4 +1,8 @@
load(qttest_p4)
+
+# do not run benchmarks by default in 'make check'
+CONFIG -= testcase
+
TEMPLATE = app
TARGET = tst_bench_imageConversion
diff --git a/tests/benchmarks/gui/image/qimagereader/qimagereader.pro b/tests/benchmarks/gui/image/qimagereader/qimagereader.pro
index db5ffcd01d..37f150ea50 100644
--- a/tests/benchmarks/gui/image/qimagereader/qimagereader.pro
+++ b/tests/benchmarks/gui/image/qimagereader/qimagereader.pro
@@ -1,4 +1,8 @@
load(qttest_p4)
+
+# do not run benchmarks by default in 'make check'
+CONFIG -= testcase
+
TEMPLATE = app
TARGET = tst_bench_qimagereader
diff --git a/tests/benchmarks/gui/image/qpixmap/qpixmap.pro b/tests/benchmarks/gui/image/qpixmap/qpixmap.pro
index 72ce42faf4..6addbb43b7 100644
--- a/tests/benchmarks/gui/image/qpixmap/qpixmap.pro
+++ b/tests/benchmarks/gui/image/qpixmap/qpixmap.pro
@@ -1,5 +1,8 @@
load(qttest_p4)
+# do not run benchmarks by default in 'make check'
+CONFIG -= testcase
+
QT += gui-private
TEMPLATE = app
diff --git a/tests/benchmarks/gui/image/qpixmapcache/qpixmapcache.pro b/tests/benchmarks/gui/image/qpixmapcache/qpixmapcache.pro
index 78ac97d259..25c6c64f68 100644
--- a/tests/benchmarks/gui/image/qpixmapcache/qpixmapcache.pro
+++ b/tests/benchmarks/gui/image/qpixmapcache/qpixmapcache.pro
@@ -1,4 +1,8 @@
load(qttest_p4)
+
+# do not run benchmarks by default in 'make check'
+CONFIG -= testcase
+
TEMPLATE = app
TARGET = tst_bench_qpixmapcache
TEMPLATE = app