Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-19 18:26:34 +01:00
Code Releases Activity

[Benchmarks+Autotests] Fixed building with Qt5 and KWallet

Browse Source 
Autotests: No longer move autotests binary to $root/bin directory
Autotests: No longer needed to specify NO_SYSTEM_DATAPATH define
This commit is contained in:
David Rosca 2014-04-13 10:47:04 +02:00
parent 45635f6da8
commit ca160731b9
9 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/run_tests.sh
View File

@ -8,8 +8,7 @@ if [ -n "$1" ]; then
fi
cd ../tests/autotests
($QMAKE DEFINES+=NO_SYSTEM_DATAPATH && make) || exit 1
cd ../../bin
($QMAKE && make) || exit 1
./autotests
exit $?

BIN
tests/autotests/autotests Executable file
View File

Binary file not shown.

6
tests/autotests/autotests.pro
View File

@ -12,10 +12,10 @@ TARGET = autotests
!unix|mac: LIBS += -L$$PWD/../../bin -lQupZilla
!mac:unix: LIBS += $$PWD/../../bin/libQupZilla.so
unix:contains(DEFINES, "NO_SYSTEM_DATAPATH"): QMAKE_LFLAGS+=$${QMAKE_LFLAGS_RPATH}\\$\$ORIGIN
QMAKE_LFLAGS+=$${QMAKE_LFLAGS_RPATH}$$PWD/../../bin
# KWallet plugin
exists($$PWD/../../bin/plugins/libKWalletPasswords.so) {
isEqual(QT_MAJOR_VERSION, 4):exists($$PWD/../../bin/plugins/libKWalletPasswords.so) {
LIBS += $$PWD/../../bin/plugins/libKWalletPasswords.so
DEFINES += HAVE_KDE_PASSWORDS_PLUGIN
}
@ -27,7 +27,7 @@ exists($$PWD/../../bin/plugins/libGnomeKeyringPasswords.so) {
}
DESTDIR = $$PWD/../../bin
DESTDIR =
OBJECTS_DIR = build
MOC_DIR = build
RCC_DIR = build

1
tests/benchmarks/adblockparserule/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
adblockparserule

BIN
tests/benchmarks/adblockparserule/adblockparserule
View File

Binary file not shown.

4
tests/benchmarks/adblockparserule/adblockparserule.cpp
View File

@ -1,6 +1,6 @@
/* ============================================================
* QupZilla - WebKit based browser
* Copyright (C) 2013 David Rosca <nowrep@gmail.com>
* Copyright (C) 2014 David Rosca <nowrep@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -33,7 +33,7 @@ void AdBlockParseRule::parseEasyList()
{
QBENCHMARK {
AdBlockSubscription* subscription = new AdBlockSubscription("EasyList", this);
subscription->setFilePath("easylist.txt");
subscription->setFilePath("../files/easylist.txt");
subscription->loadSubscription(QStringList());
}
}

14
tests/benchmarks/benchmarks.pri
View File

@ -10,19 +10,7 @@ isEqual(QT_MAJOR_VERSION, 5) {
!unix|mac: LIBS += -L$$PWD/../../bin -lQupZilla
!mac:unix: LIBS += $$PWD/../../bin/libQupZilla.so
unix:contains(DEFINES, "NO_SYSTEM_DATAPATH"): QMAKE_LFLAGS+=$${QMAKE_LFLAGS_RPATH}$$PWD/../../bin
# KWallet plugin
exists($$PWD/../../bin/plugins/libKWalletPasswords.so) {
LIBS += $$PWD/../../bin/plugins/libKWalletPasswords.so
DEFINES += HAVE_KDE_PASSWORDS_PLUGIN
}
# GnomeKeyring plugin
exists($$PWD/../../bin/plugins/libGnomeKeyringPasswords.so) {
LIBS += $$PWD/../../bin/plugins/libGnomeKeyringPasswords.so
DEFINES += HAVE_GNOME_PASSWORDS_PLUGIN
}
QMAKE_LFLAGS+=$${QMAKE_LFLAGS_RPATH}$$PWD/../../bin
DESTDIR =
OBJECTS_DIR = build

4
tests/benchmarks/benchmarks.pro
View File

@ -1,7 +1,5 @@
TEMPLATE = subdirs
include(benchmarks.pri)
defineTest(addSubdir) {
for(subdir, 1) {
entries = $$files($$subdir/*)
@ -17,4 +15,4 @@ defineTest(addSubdir) {
export (SUBDIRS)
}
addSubdir($$PWD)
addSubdir($$PWD)

0
tests/benchmarks/adblockparserule/easylist.txt → tests/benchmarks/files/easylist.txt
View File