From 0f929bfa9aa76d7db54a62c6a571e97224384ec1 Mon Sep 17 00:00:00 2001 From: Kurt Korbatits Date: Mon, 12 Mar 2012 14:24:02 +1000 Subject: Fixed benchmarks to work from install directory - Changed benchmarks to use TESTDATA and QFINDTESTDATA - Fixed up targets all use tst_bench_ syntax Change-Id: I5c2936702e248478f5df225ce38893158ee22d7f Reviewed-by: Jason McDonald Reviewed-by: Rohan McGovern --- tests/benchmarks/plugins/imageformats/jpeg/jpeg.cpp | 4 +++- tests/benchmarks/plugins/imageformats/jpeg/jpeg.pro | 8 ++------ 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'tests/benchmarks/plugins/imageformats') diff --git a/tests/benchmarks/plugins/imageformats/jpeg/jpeg.cpp b/tests/benchmarks/plugins/imageformats/jpeg/jpeg.cpp index a3644efd53..761fbcc7a7 100644 --- a/tests/benchmarks/plugins/imageformats/jpeg/jpeg.cpp +++ b/tests/benchmarks/plugins/imageformats/jpeg/jpeg.cpp @@ -59,7 +59,9 @@ void tst_jpeg::jpegDecodingQtWebkitStyle() { // QtWebkit currently calls size() to get the image size for layouting purposes. // Then when it is in the viewport (we assume that here) it actually gets decoded. - QFile inputJpeg(SRCDIR "n900.jpeg"); + QString testFile = QFINDTESTDATA("n900.jpeg"); + QVERIFY2(!testFile.isEmpty(), "cannot find test file n900.jpeg!"); + QFile inputJpeg(testFile); QVERIFY(inputJpeg.exists()); inputJpeg.open(QIODevice::ReadOnly); QByteArray imageData = inputJpeg.readAll(); diff --git a/tests/benchmarks/plugins/imageformats/jpeg/jpeg.pro b/tests/benchmarks/plugins/imageformats/jpeg/jpeg.pro index d278e9e721..281e79f585 100644 --- a/tests/benchmarks/plugins/imageformats/jpeg/jpeg.pro +++ b/tests/benchmarks/plugins/imageformats/jpeg/jpeg.pro @@ -3,10 +3,6 @@ TARGET = jpeg QT += testlib CONFIG += release -wince*: { - DEFINES += SRCDIR=\\\"\\\" -} else { - DEFINES += SRCDIR=\\\"$$PWD/\\\" -} - SOURCES += jpeg.cpp + +TESTDATA = n900.jpeg -- cgit v1.2.3