From 005c98817c1a82724231c700047e4925324580e5 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Mon, 4 Jul 2016 12:28:31 +0200 Subject: [PATCH] ClangStaticAnalyzer: Add test project with C++11 includes Task-number: QTCREATORBUG-16526 Change-Id: I67bbf172dabe993697d43b7b9d804a79ebfffa9c Reviewed-by: Christian Kandeler --- .../clangstaticanalyzerunittests.cpp | 5 ++ .../clangstaticanalyzerunittests.qrc | 3 + .../unit-tests/stdc++11-includes/main.cpp | 88 +++++++++++++++++++ .../stdc++11-includes/stdc++11-includes.pro | 7 ++ .../stdc++11-includes/stdc++11-includes.qbs | 14 +++ 5 files changed, 117 insertions(+) create mode 100644 src/plugins/clangstaticanalyzer/unit-tests/stdc++11-includes/main.cpp create mode 100644 src/plugins/clangstaticanalyzer/unit-tests/stdc++11-includes/stdc++11-includes.pro create mode 100644 src/plugins/clangstaticanalyzer/unit-tests/stdc++11-includes/stdc++11-includes.qbs diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerunittests.cpp b/src/plugins/clangstaticanalyzer/clangstaticanalyzerunittests.cpp index 95da87b38b0..c40572d9ade 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerunittests.cpp +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerunittests.cpp @@ -110,6 +110,11 @@ void ClangStaticAnalyzerUnitTests::testProject_data() QTest::newRow("simple qmake library project") << QString(m_tmpDir->absolutePath("simple-library/simple-library.pro")) << 0; + QTest::newRow("stdc++11-includes qbs project") + << QString(m_tmpDir->absolutePath("stdc++11-includes/stdc++11-includes.qbs")) << 0; + QTest::newRow("stdc++11-includes qmake project") + << QString(m_tmpDir->absolutePath("stdc++11-includes/stdc++11-includes.pro")) << 0; + QTest::newRow("qt-widgets-app qbs project") << QString(m_tmpDir->absolutePath("qt-widgets-app/qt-widgets-app.qbs")) << 0; QTest::newRow("qt-widgets-app qmake project") diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerunittests.qrc b/src/plugins/clangstaticanalyzer/clangstaticanalyzerunittests.qrc index 29fa6eff930..a9764bfa309 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerunittests.qrc +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerunittests.qrc @@ -16,5 +16,8 @@ unit-tests/simple-library/simple-library.h unit-tests/simple-library/simple-library.pro unit-tests/simple-library/simple-library.qbs + unit-tests/stdc++11-includes/main.cpp + unit-tests/stdc++11-includes/stdc++11-includes.pro + unit-tests/stdc++11-includes/stdc++11-includes.qbs diff --git a/src/plugins/clangstaticanalyzer/unit-tests/stdc++11-includes/main.cpp b/src/plugins/clangstaticanalyzer/unit-tests/stdc++11-includes/main.cpp new file mode 100644 index 00000000000..b394f380c38 --- /dev/null +++ b/src/plugins/clangstaticanalyzer/unit-tests/stdc++11-includes/main.cpp @@ -0,0 +1,88 @@ +// Based on http://en.cppreference.com/w/cpp/header + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#ifndef _MSC_VER +# include +#endif +#include +#include +#include +#include +#include +#include +#include +#include +#include +#if defined(_MSC_VER) && _MSC_VER > 1800 +# include +#endif +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +int main() +{ +} diff --git a/src/plugins/clangstaticanalyzer/unit-tests/stdc++11-includes/stdc++11-includes.pro b/src/plugins/clangstaticanalyzer/unit-tests/stdc++11-includes/stdc++11-includes.pro new file mode 100644 index 00000000000..c33caaa2494 --- /dev/null +++ b/src/plugins/clangstaticanalyzer/unit-tests/stdc++11-includes/stdc++11-includes.pro @@ -0,0 +1,7 @@ +TEMPLATE = app +CONFIG += console c++11 +CONFIG -= app_bundle +CONFIG -= qt + +TARGET = stdc++11-includes +SOURCES += main.cpp diff --git a/src/plugins/clangstaticanalyzer/unit-tests/stdc++11-includes/stdc++11-includes.qbs b/src/plugins/clangstaticanalyzer/unit-tests/stdc++11-includes/stdc++11-includes.qbs new file mode 100644 index 00000000000..e120f9b4fca --- /dev/null +++ b/src/plugins/clangstaticanalyzer/unit-tests/stdc++11-includes/stdc++11-includes.qbs @@ -0,0 +1,14 @@ +import qbs + +CppApplication { + name : "Standard C++ Includes" + consoleApplication: true + cpp.cxxLanguageVersion: "c++11" + + files: "main.cpp" + + Group { // Properties for the produced executable + fileTagsFilter: product.type + qbs.install: true + } +}