diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:17:50 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:17:50 +0100 |
| commit | 94b3194bb02bfba8ca3e3dfb76ac8b4207dc3658 (patch) | |
| tree | e97ed34ee1b333edabee1e7e26ee16ed48ec5b8d | |
| parent | ea2a8b12fe36203c29f0bd1a85dc41aada905bf3 (diff) | |
| parent | 0bb3f3017f72cbf8d6866b8baa1820ab3dd89316 (diff) | |
| download | qtscript-94b3194bb02bfba8ca3e3dfb76ac8b4207dc3658.tar.gz | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I9c2e72efdbd5fa852aff22a3070ac72f092fb880
| -rw-r--r-- | tests/auto/auto.pro | 5 | ||||
| -rw-r--r-- | tests/auto/qscriptjstestsuite/BLACKLIST | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 07b696c..1e39494 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -30,3 +30,8 @@ SUBDIRS=\ qscriptvalue !cross_compile: SUBDIRS += host.pro + +# QTBUG-63916 +boot2qt: { + contains(QT_ARCH, arm64): SUBDIRS -= cmake +} diff --git a/tests/auto/qscriptjstestsuite/BLACKLIST b/tests/auto/qscriptjstestsuite/BLACKLIST new file mode 100644 index 0000000..1b4053f --- /dev/null +++ b/tests/auto/qscriptjstestsuite/BLACKLIST @@ -0,0 +1,8 @@ +[ecma/Expressions:-(-2147483648) == 2147483648] +# QTBUG-63916 +b2qt 64bit + +[ecma/TypeConversion:- -"0x80000000"] +# QTBUG-63916 +b2qt 64bit + |