diff options
author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-03-16 10:31:07 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-03-16 10:31:07 +0100 |
commit | 198606f6dbca95ba3a170fff387327d8271018cd (patch) | |
tree | 79e8c632f5277fc7f0ae30ae7fb1e1c41745c815 /tests/benchmarks/corelib | |
parent | 77c0c1ca6505eb66bd75b3766f9a498574822bd1 (diff) | |
parent | 0d5ffd67a4748bcbf19dc3a4b9a36ae6314e58a6 (diff) |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/plugins/platforms/xcb/qxcbnativeinterface.cpp
src/plugins/platforms/xcb/qxcbnativeinterface.h
Change-Id: I31b38ba439b9341d51a01c0fd54bea33f7410076
Diffstat (limited to 'tests/benchmarks/corelib')
-rw-r--r-- | tests/benchmarks/corelib/tools/qregexp/main.cpp | 54 | ||||
-rw-r--r-- | tests/benchmarks/corelib/tools/qregexp/qregexp.pro | 8 |
2 files changed, 47 insertions, 15 deletions
diff --git a/tests/benchmarks/corelib/tools/qregexp/main.cpp b/tests/benchmarks/corelib/tools/qregexp/main.cpp index 88d3b3fa96..aa31b037fe 100644 --- a/tests/benchmarks/corelib/tools/qregexp/main.cpp +++ b/tests/benchmarks/corelib/tools/qregexp/main.cpp @@ -75,17 +75,13 @@ private slots: void rangeReplace2(); void matchReplace2(); -#ifdef HAVE_JSC void simpleFindJSC(); void rangeReplaceJSC(); void matchReplaceJSC(); -#endif -#ifdef HAVE_BOOST void simpleFindBoost(); void rangeReplaceBoost(); void matchReplaceBoost(); -#endif /* those apply an (incorrect) regexp on entire source (this main.cpp). JSC appears to handle this @@ -95,14 +91,10 @@ private slots: void horribleReplace1(); void horribleReplace2(); void horribleWrongReplace2(); -#ifdef HAVE_JSC void horribleWrongReplaceJSC(); void horribleReplaceJSC(); -#endif -#ifdef HAVE_BOOST void horribleWrongReplaceBoost(); void horribleReplaceBoost(); -#endif private: QString str1; QString str2; @@ -451,9 +443,9 @@ void tst_qregexp::horribleReplace2() } QCOMPARE(r, QString("1.2.3")); } -#ifdef HAVE_JSC void tst_qregexp::simpleFindJSC() { +#ifdef HAVE_JSC int numr; const char * errmsg=" "; QString rxs("happy"); @@ -467,10 +459,14 @@ void tst_qregexp::simpleFindJSC() jsRegExpFree(rx); QCOMPARE(numr, 1); QCOMPARE(offsetVector[0], 11); +#else + QSKIP("JSC is not enabled for this platform"); +#endif } void tst_qregexp::rangeReplaceJSC() { +#ifdef HAVE_JSC QScriptValue r; QScriptEngine engine; engine.globalObject().setProperty("s", str1); @@ -480,10 +476,14 @@ void tst_qregexp::rangeReplaceJSC() r = replaceFunc.call(QScriptValue()); } QCOMPARE(r.toString(), QString("W- -r- -ll h-ppy monk-ys")); +#else + QSKIP("JSC is not enabled for this platform"); +#endif } void tst_qregexp::matchReplaceJSC() { +#ifdef HAVE_JSC QScriptValue r; QScriptEngine engine; engine.globalObject().setProperty("s", str1); @@ -493,10 +493,14 @@ void tst_qregexp::matchReplaceJSC() r = replaceFunc.call(QScriptValue()); } QCOMPARE(r.toString(), QString("eaeaae")); +#else + QSKIP("JSC is not enabled for this platform"); +#endif } void tst_qregexp::horribleWrongReplaceJSC() { +#ifdef HAVE_JSC QScriptValue r; QScriptEngine engine; engine.globalObject().setProperty("s", str2); @@ -506,10 +510,14 @@ void tst_qregexp::horribleWrongReplaceJSC() r = replaceFunc.call(QScriptValue()); } QCOMPARE(r.toString(), str2); +#else + QSKIP("JSC is not enabled for this platform"); +#endif } void tst_qregexp::horribleReplaceJSC() { +#ifdef HAVE_JSC QScriptValue r; QScriptEngine engine; // the m flag doesn't actually work here; dunno @@ -520,11 +528,14 @@ void tst_qregexp::horribleReplaceJSC() r = replaceFunc.call(QScriptValue()); } QCOMPARE(r.toString(), QString("1.2.3")); -} +#else + QSKIP("JSC is not enabled for this platform"); #endif +} +void tst_qregexp::simpleFindBoost() +{ #ifdef HAVE_BOOST -void tst_qregexp::simpleFindBoost(){ int roff; boost::regex rx ("happy", boost::regex_constants::perl); std::string s = str1.toStdString(); @@ -538,10 +549,15 @@ void tst_qregexp::simpleFindBoost(){ roff = (what[0].first)-start; } QCOMPARE(roff, 11); +#else + QSKIP("Boost is not enabled for this platform"); +#endif + } void tst_qregexp::rangeReplaceBoost() { +#ifdef HAVE_BOOST boost::regex pattern ("[a-f]", boost::regex_constants::perl); std::string s = str1.toStdString(); std::string r; @@ -549,10 +565,14 @@ void tst_qregexp::rangeReplaceBoost() r = boost::regex_replace (s, pattern, "-"); } QCOMPARE(r, std::string("W- -r- -ll h-ppy monk-ys")); +#else + QSKIP("Boost is not enabled for this platform"); +#endif } void tst_qregexp::matchReplaceBoost() { +#ifdef HAVE_BOOST boost::regex pattern ("[^a-f]*([a-f]+)[^a-f]*",boost::regex_constants::perl); std::string s = str1.toStdString(); std::string r; @@ -560,10 +580,14 @@ void tst_qregexp::matchReplaceBoost() r = boost::regex_replace (s, pattern, "$1"); } QCOMPARE(r, std::string("eaeaae")); +#else + QSKIP("Boost is not enabled for this platform"); +#endif } void tst_qregexp::horribleWrongReplaceBoost() { +#ifdef HAVE_BOOST boost::regex pattern (".*#""define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+)\".*", boost::regex_constants::perl); std::string s = str2.toStdString(); std::string r; @@ -571,10 +595,14 @@ void tst_qregexp::horribleWrongReplaceBoost() r = boost::regex_replace (s, pattern, "$1.$2.$3"); } QCOMPARE(r, s); +#else + QSKIP("Boost is not enabled for this platform"); +#endif } void tst_qregexp::horribleReplaceBoost() { +#ifdef HAVE_BOOST boost::regex pattern (".*#""define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+).*", boost::regex_constants::perl); std::string s = str2.toStdString(); std::string r; @@ -582,8 +610,10 @@ void tst_qregexp::horribleReplaceBoost() r = boost::regex_replace (s, pattern, "$1.$2.$3"); } QCOMPARE(r, std::string("1.2.3")); +#else + QSKIP("Boost is not enabled for this platform"); +#endif } -#endif //HAVE_BOOST QTEST_MAIN(tst_qregexp) diff --git a/tests/benchmarks/corelib/tools/qregexp/qregexp.pro b/tests/benchmarks/corelib/tools/qregexp/qregexp.pro index d194d2b698..8b35ecffed 100644 --- a/tests/benchmarks/corelib/tools/qregexp/qregexp.pro +++ b/tests/benchmarks/corelib/tools/qregexp/qregexp.pro @@ -11,9 +11,11 @@ qtHaveModule(script):!pcre { QT += script } -exists($$[QT_SYSROOT]/usr/include/boost/regex.hpp) { -DEFINES+=HAVE_BOOST -LIBS+=-lboost_regex +!qnx { + exists($$[QT_SYSROOT]/usr/include/boost/regex.hpp) { + DEFINES += HAVE_BOOST + LIBS += -lboost_regex + } } DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |