diff options
Diffstat (limited to 'tests/auto')
7 files changed, 17 insertions, 14 deletions
diff --git a/tests/auto/qscriptcontext/tst_qscriptcontext.cpp b/tests/auto/qscriptcontext/tst_qscriptcontext.cpp index 14c204e..6f14965 100644 --- a/tests/auto/qscriptcontext/tst_qscriptcontext.cpp +++ b/tests/auto/qscriptcontext/tst_qscriptcontext.cpp @@ -353,7 +353,7 @@ void tst_QScriptContext::thisObject() void tst_QScriptContext::returnValue() { - QSKIP("Internal function not implemented in JSC-based back-end", SkipAll); + QSKIP("Internal function not implemented in JSC-based back-end"); QScriptEngine eng; eng.evaluate("123"); QCOMPARE(eng.currentContext()->returnValue().toNumber(), 123.0); diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp index fffb7ea..1594343 100644 --- a/tests/auto/qscriptengine/tst_qscriptengine.cpp +++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp @@ -1126,7 +1126,7 @@ void tst_QScriptEngine::newQMetaObject() void tst_QScriptEngine::newActivationObject() { - QSKIP("internal function not implemented in JSC-based back-end", SkipAll); + QSKIP("internal function not implemented in JSC-based back-end"); QScriptEngine eng; QScriptValue act = eng.newActivationObject(); QEXPECT_FAIL("", "", Continue); diff --git a/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp b/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp index 17e4699..f049e53 100644 --- a/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp +++ b/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp @@ -878,7 +878,7 @@ void tst_QScriptEngineAgent::functionEntryAndExit_builtin_data() /** check behaiviour of built-in function */ void tst_QScriptEngineAgent::functionEntryAndExit_builtin() { - QSKIP("The test fails on platforms others than Linux. The issue will be fixed with next JSC update", SkipAll); + QSKIP("The test fails on platforms others than Linux. The issue will be fixed with next JSC update"); QFETCH(QString, script); QFETCH(QString, result); QScriptEngine eng; diff --git a/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp b/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp index a3f3d1c..32be18d 100644 --- a/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp +++ b/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp @@ -98,7 +98,7 @@ tst_QScriptEngineDebugger::~tst_QScriptEngineDebugger() void tst_QScriptEngineDebugger::attachAndDetach() { #if defined(Q_OS_WINCE) && _WIN32_WCE < 0x600 - QSKIP("skipped due to high mem usage until task 261062 is fixed", SkipAll); + QSKIP("skipped due to high mem usage until task 261062 is fixed"); #endif { QScriptEngineDebugger debugger; @@ -165,7 +165,7 @@ void tst_QScriptEngineDebugger::attachAndDetach() void tst_QScriptEngineDebugger::action() { #if defined(Q_OS_WINCE) && _WIN32_WCE < 0x600 - QSKIP("skipped due to high mem usage until task 261062 is fixed", SkipAll); + QSKIP("skipped due to high mem usage until task 261062 is fixed"); #endif QScriptEngine engine; @@ -203,7 +203,7 @@ void tst_QScriptEngineDebugger::action() void tst_QScriptEngineDebugger::widget() { #if defined(Q_OS_WINCE) && _WIN32_WCE < 0x600 - QSKIP("skipped due to high mem usage until task 261062 is fixed", SkipAll); + QSKIP("skipped due to high mem usage until task 261062 is fixed"); #endif QScriptEngine engine; @@ -235,7 +235,7 @@ void tst_QScriptEngineDebugger::widget() void tst_QScriptEngineDebugger::standardObjects() { #if defined(Q_OS_WINCE) && _WIN32_WCE < 0x600 - QSKIP("skipped due to high mem usage until task 261062 is fixed", SkipAll); + QSKIP("skipped due to high mem usage until task 261062 is fixed"); #endif QScriptEngine engine; @@ -264,7 +264,7 @@ void tst_QScriptEngineDebugger::standardObjects() void tst_QScriptEngineDebugger::debuggerSignals() { #if defined(Q_OS_WINCE) && _WIN32_WCE < 0x600 - QSKIP("skipped due to high mem usage until task 261062 is fixed", SkipAll); + QSKIP("skipped due to high mem usage until task 261062 is fixed"); #endif QScriptEngine engine; @@ -341,7 +341,7 @@ private: void tst_QScriptEngineDebugger::consoleCommands() { - QSKIP("This test can hang / misbehave because of timing/event loop issues (task 241300)", SkipAll); + QSKIP("This test can hang / misbehave because of timing/event loop issues (task 241300)"); QScriptEngine engine; QScriptEngineDebugger debugger; @@ -753,7 +753,7 @@ private: void tst_QScriptEngineDebugger::multithreadedDebugging() { #ifdef Q_OS_WINCE - QSKIP("This tests uses too much memory for Windows CE", SkipAll); + QSKIP("This tests uses too much memory for Windows CE"); #endif ScriptEvaluator eval; QThread thread; diff --git a/tests/auto/qscriptjstestsuite/skip.txt b/tests/auto/qscriptjstestsuite/skip.txt index 2dc0ccb..c007041 100644 --- a/tests/auto/qscriptjstestsuite/skip.txt +++ b/tests/auto/qscriptjstestsuite/skip.txt @@ -5,5 +5,9 @@ regress-322135-01.js | asserts regress-322135-02.js | asserts regress-322135-03.js | takes forever regress-322135-04.js | takes forever +ecma_3/Array/regress-387501.js | Produces wrong error message ecma_3/RegExp/regress-375715-04.js | bug ecma_3/RegExp/regress-289669.js | Can fail due to relying on wall-clock time +ecma_3/RegExp/regress-311414.js | Can fail due to relying on wall-clock time +ecma_3/RegExp/regress-330684.js | Can fail due to relying on wall-clock time +ecma_3/RegExp/regress-375711.js | Can fail due to relying on wall-clock time diff --git a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp index 0e4f5b9..a9247d9 100644 --- a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp +++ b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp @@ -294,7 +294,7 @@ void tst_QScriptJSTestSuite::runTestFunction(int testIndex) } else { QFETCH(TestRecord, record); if ((record.lineNumber == -1) && (record.actual == "QSKIP")) { - QTest::qSkip(record.description.toLatin1(), QTest::SkipAll, record.fileName.toLatin1(), -1); + QTest::qSkip(record.description.toLatin1(), record.fileName.toLatin1(), -1); } else { QString msg; FailureItem::Action failAct; @@ -307,8 +307,7 @@ void tst_QScriptJSTestSuite::runTestFunction(int testIndex) record.lineNumber); break; case FailureItem::Skip: - QTest::qSkip(msg.toLatin1(), QTest::SkipSingle, - record.fileName.toLatin1(), record.lineNumber); + QTest::qSkip(msg.toLatin1(), record.fileName.toLatin1(), record.lineNumber); break; } } diff --git a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp index b02d3ab..caaaa74 100644 --- a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp +++ b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp @@ -135,7 +135,7 @@ void tst_QScriptV8TestSuite::runTestFunction(int testIndex) QString excludeMessage; if (isExcludedTest(name, &excludeMessage)) { - QTest::qSkip(excludeMessage.toLatin1(), QTest::SkipAll, path.toLatin1(), -1); + QTest::qSkip(excludeMessage.toLatin1(), path.toLatin1(), -1); return; } |