diff options
author | Sergio Martins <smartins@kde.org> | 2019-10-20 01:07:10 +0100 |
---|---|---|
committer | Sergio Martins <smartins@kde.org> | 2019-10-20 01:08:21 +0100 |
commit | 6b140de078c0dc6f5e6d6732512ad5e454d887d0 (patch) | |
tree | cfd87b4f7411beafb18e3a8b126e831860c8d1e7 | |
parent | 636b53fe4e5f26048e950e4706528bd986c7f8fe (diff) |
inefficient-qlist: Fix test on 32-bit platforms
The warning is different.
BUG: 413169
-rw-r--r-- | tests/inefficient-qlist/main.cpp.expected.x86 | 4 | ||||
-rwxr-xr-x | tests/run_tests.py | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/tests/inefficient-qlist/main.cpp.expected.x86 b/tests/inefficient-qlist/main.cpp.expected.x86 new file mode 100644 index 00000000..81519a19 --- /dev/null +++ b/tests/inefficient-qlist/main.cpp.expected.x86 @@ -0,0 +1,4 @@ +inefficient-qlist/main.cpp:24:5: warning: Use QVector instead of QList for type with size 9 bytes [-Wclazy-inefficient-qlist] +inefficient-qlist/main.cpp:38:11: warning: Use QVector instead of QList for type with size 9 bytes [-Wclazy-inefficient-qlist] +inefficient-qlist/main.cpp:40:5: warning: Use QVector instead of QList for type with size 9 bytes [-Wclazy-inefficient-qlist] +inefficient-qlist/main.cpp:53:5: warning: Use QVector instead of QList for type with size 12 bytes [-Wclazy-inefficient-qlist] diff --git a/tests/run_tests.py b/tests/run_tests.py index f6b55f6c..9b648efe 100755 --- a/tests/run_tests.py +++ b/tests/run_tests.py @@ -4,7 +4,7 @@ import sys, os, subprocess, string, re, json, threading, multiprocessing, argpar import shutil from threading import Thread from sys import platform as _platform - +import platform # cd into the folder containing this script os.chdir(os.path.realpath(os.path.dirname(sys.argv[0]))) @@ -586,6 +586,10 @@ def run_unit_test(test, is_standalone): result_file = filename + ".result" expected_file = filename + ".expected" + # Some tests have different output on 32 bit + if platform.architecture()[0] == '32bit' and os.path.exists(expected_file + '.x86'): + expected_file = expected_file + '.x86' + if is_standalone and test.isScript(): return True |