From 79525981dc3c73f0465ea2e5438507c98676154b Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 2 Mar 2015 10:00:52 +0200 Subject: [PATCH] Tests: Refix MSVC warnings for valgrind tests Fix in 5a5acd664ee16bf50067492da541a9d8355c3c36 was incomplete. Change-Id: I36a0666d2a6a8ccb514ebf612fbac2eded150102 Reviewed-by: Christian Kandeler --- tests/auto/valgrind/memcheck/testapps/leak2/leak2.pro | 1 + tests/auto/valgrind/memcheck/testapps/leak3/leak3.pro | 2 +- tests/auto/valgrind/memcheck/testapps/syscall/main.cpp | 2 -- tests/auto/valgrind/memcheck/testapps/syscall/syscall.pro | 3 ++- tests/auto/valgrind/memcheck/testapps/testapp.qbs | 1 + tests/auto/valgrind/memcheck/testapps/uninit1/uninit1.pro | 2 +- tests/auto/valgrind/memcheck/testapps/uninit2/uninit2.pro | 2 +- tests/auto/valgrind/memcheck/testapps/uninit3/uninit3.pro | 2 +- 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/auto/valgrind/memcheck/testapps/leak2/leak2.pro b/tests/auto/valgrind/memcheck/testapps/leak2/leak2.pro index 59397bf849c..aae4b9a45ae 100644 --- a/tests/auto/valgrind/memcheck/testapps/leak2/leak2.pro +++ b/tests/auto/valgrind/memcheck/testapps/leak2/leak2.pro @@ -3,6 +3,7 @@ TARGET = leak2 CONFIG += debug +win32-msvc*:QMAKE_CXXFLAGS += -w44996 QT += core macx:CONFIG -= app_bundle diff --git a/tests/auto/valgrind/memcheck/testapps/leak3/leak3.pro b/tests/auto/valgrind/memcheck/testapps/leak3/leak3.pro index 0076f66a1e3..6eebcbb04ac 100644 --- a/tests/auto/valgrind/memcheck/testapps/leak3/leak3.pro +++ b/tests/auto/valgrind/memcheck/testapps/leak3/leak3.pro @@ -7,6 +7,6 @@ QT += core macx:CONFIG -= app_bundle -win32-msvc*:QMAKE_CXXFLAGS += -w4996 +win32-msvc*:QMAKE_CXXFLAGS += -w44996 SOURCES += main.cpp diff --git a/tests/auto/valgrind/memcheck/testapps/syscall/main.cpp b/tests/auto/valgrind/memcheck/testapps/syscall/main.cpp index f4b33a4d6bc..a0147dc90dc 100644 --- a/tests/auto/valgrind/memcheck/testapps/syscall/main.cpp +++ b/tests/auto/valgrind/memcheck/testapps/syscall/main.cpp @@ -28,8 +28,6 @@ ** ****************************************************************************/ -#pragma GCC diagnostic ignored "-Wuninitialized" - int main() { int i; diff --git a/tests/auto/valgrind/memcheck/testapps/syscall/syscall.pro b/tests/auto/valgrind/memcheck/testapps/syscall/syscall.pro index 108636f6549..026a9fdcdb6 100644 --- a/tests/auto/valgrind/memcheck/testapps/syscall/syscall.pro +++ b/tests/auto/valgrind/memcheck/testapps/syscall/syscall.pro @@ -2,7 +2,8 @@ TEMPLATE = app TARGET = syscall CONFIG += debug -QMAKE_CXXFLAGS = -O0 +win32-msvc*:QMAKE_CXXFLAGS += -w44700 +else:QMAKE_CXXFLAGS = -O0 -Wno-uninitialized QT += core diff --git a/tests/auto/valgrind/memcheck/testapps/testapp.qbs b/tests/auto/valgrind/memcheck/testapps/testapp.qbs index ed0a8573dba..321b6125d65 100644 --- a/tests/auto/valgrind/memcheck/testapps/testapp.qbs +++ b/tests/auto/valgrind/memcheck/testapps/testapp.qbs @@ -3,6 +3,7 @@ import qbs QtcAutotest { type: ["application"] // Not to be executed directly by autotest-runner name: "Memcheck " + testName + " autotest" + cpp.warningLevel: "none" property string testName targetName: testName // Test runner hardcodes the names of the executables destinationDirectory: project.buildDirectory + '/' diff --git a/tests/auto/valgrind/memcheck/testapps/uninit1/uninit1.pro b/tests/auto/valgrind/memcheck/testapps/uninit1/uninit1.pro index 7690b4848b3..4ccd99a5413 100644 --- a/tests/auto/valgrind/memcheck/testapps/uninit1/uninit1.pro +++ b/tests/auto/valgrind/memcheck/testapps/uninit1/uninit1.pro @@ -3,7 +3,7 @@ TARGET = uninit1 CONFIG += debug console CONFIG -= qt -win32-msvc*:QMAKE_CXXFLAGS += -w4700 +win32-msvc*:QMAKE_CXXFLAGS += -w44700 else:QMAKE_CXXFLAGS = -O0 -Wno-uninitialized macx:CONFIG -= app_bundle diff --git a/tests/auto/valgrind/memcheck/testapps/uninit2/uninit2.pro b/tests/auto/valgrind/memcheck/testapps/uninit2/uninit2.pro index a2c3341c15a..26c1ce41fb6 100644 --- a/tests/auto/valgrind/memcheck/testapps/uninit2/uninit2.pro +++ b/tests/auto/valgrind/memcheck/testapps/uninit2/uninit2.pro @@ -3,7 +3,7 @@ TARGET = uninit2 CONFIG += debug console CONFIG -= qt -win32-msvc*:QMAKE_CXXFLAGS += -w4700 +win32-msvc*:QMAKE_CXXFLAGS += -w44700 else:QMAKE_CXXFLAGS = -O0 -Wno-uninitialized macx:CONFIG -= app_bundle diff --git a/tests/auto/valgrind/memcheck/testapps/uninit3/uninit3.pro b/tests/auto/valgrind/memcheck/testapps/uninit3/uninit3.pro index 43fdc08abef..2d7ff256c15 100644 --- a/tests/auto/valgrind/memcheck/testapps/uninit3/uninit3.pro +++ b/tests/auto/valgrind/memcheck/testapps/uninit3/uninit3.pro @@ -3,7 +3,7 @@ TARGET = uninit3 CONFIG += debug console CONFIG -= qt -win32-msvc*:QMAKE_CXXFLAGS += -w4700 +win32-msvc*:QMAKE_CXXFLAGS += -w44700 else:QMAKE_CXXFLAGS = -O0 -Wno-uninitialized macx:CONFIG -= app_bundle