summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tests/auto/qscriptcontext/qscriptcontext.pro3
-rw-r--r--tests/auto/qscriptcontext/tst_qscriptcontext.cpp3
-rw-r--r--tests/auto/qscriptv8testsuite/skip.txt4
3 files changed, 9 insertions, 1 deletions
diff --git a/tests/auto/qscriptcontext/qscriptcontext.pro b/tests/auto/qscriptcontext/qscriptcontext.pro
index 5ca1a2f..6731cf9 100644
--- a/tests/auto/qscriptcontext/qscriptcontext.pro
+++ b/tests/auto/qscriptcontext/qscriptcontext.pro
@@ -3,4 +3,5 @@ CONFIG += testcase
QT = core script testlib
SOURCES += tst_qscriptcontext.cpp
-
+# QTBUG-23463
+linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):DEFINES+=UBUNTU_ONEIRIC
diff --git a/tests/auto/qscriptcontext/tst_qscriptcontext.cpp b/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
index 64ccce6..b9c3f0c 100644
--- a/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
+++ b/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
@@ -964,6 +964,9 @@ void tst_QScriptContext::backtrace_data()
void tst_QScriptContext::backtrace()
{
+#if defined(UBUNTU_ONEIRIC) && defined(__x86_64__)
+ QSKIP("Fails on this platform - QTBUG-23463");
+#endif
QFETCH(QString, code);
QFETCH(QStringList, expectedbacktrace);
diff --git a/tests/auto/qscriptv8testsuite/skip.txt b/tests/auto/qscriptv8testsuite/skip.txt
index 9658c2b..f5eec08 100644
--- a/tests/auto/qscriptv8testsuite/skip.txt
+++ b/tests/auto/qscriptv8testsuite/skip.txt
@@ -29,3 +29,7 @@ to-precision | Unresolved failures on Mac OS X (Cocoa)
[Q_OS_WIN]
to-precision | Unresolved failures on Windows
+
+[Q_OS_LINUX]
+smi-negative-zero | Unresolved sign failure for Ubuntu 11.10 x64 (QTBUG-23463)
+to-precision | Unresolved failure on Ubuntu 11.10 x64 (QTBUG-23463)