From c705cfca8c5e5c42345ad63caed712baef7eb604 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Date: Wed, 20 Jan 2016 20:13:47 +0100
Subject: [PATCH] ClangStaticAnalyzer: Move non-plugin tests into tests/auto
Change-Id: I014ef6fd125393b69ec242219c0833efde0c216b
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
---
.../clangstaticanalyzer/tests/tests.pri | 22 -------------------
tests/auto/auto.pro | 1 +
tests/auto/auto.qbs | 1 +
.../clangstaticanalyzer.pro | 0
.../clangstaticanalyzer.qbs | 1 +
.../clangstaticanalyzerautotest.qbs | 2 +-
.../clangstaticanalyzerlogfilereader.pro | 2 +-
.../clangstaticanalyzerlogfilereader.qbs | 0
.../data/noDiagnostics.plist | 0
.../data/someDiagnostics.plist | 0
.../tst_clangstaticanalyzerlogfilereader.cpp | 0
.../clangstaticanalyzerrunner.pro | 2 +-
.../clangstaticanalyzerrunner.qbs | 0
.../tst_clangstaticanalyzerrunner.cpp | 0
.../clangstaticanalyzertest.pri | 5 +++++
15 files changed, 11 insertions(+), 25 deletions(-)
delete mode 100644 src/plugins/clangstaticanalyzer/tests/tests.pri
rename src/plugins/clangstaticanalyzer/tests/tests.pro => tests/auto/clangstaticanalyzer/clangstaticanalyzer.pro (100%)
rename src/plugins/clangstaticanalyzer/tests/tests.qbs => tests/auto/clangstaticanalyzer/clangstaticanalyzer.qbs (75%)
rename {src/plugins/clangstaticanalyzer/tests => tests/auto/clangstaticanalyzer}/clangstaticanalyzerautotest.qbs (73%)
rename {src/plugins/clangstaticanalyzer/tests => tests/auto/clangstaticanalyzer}/clangstaticanalyzerlogfilereader/clangstaticanalyzerlogfilereader.pro (90%)
rename {src/plugins/clangstaticanalyzer/tests => tests/auto/clangstaticanalyzer}/clangstaticanalyzerlogfilereader/clangstaticanalyzerlogfilereader.qbs (100%)
rename {src/plugins/clangstaticanalyzer/tests => tests/auto/clangstaticanalyzer}/clangstaticanalyzerlogfilereader/data/noDiagnostics.plist (100%)
rename {src/plugins/clangstaticanalyzer/tests => tests/auto/clangstaticanalyzer}/clangstaticanalyzerlogfilereader/data/someDiagnostics.plist (100%)
rename {src/plugins/clangstaticanalyzer/tests => tests/auto/clangstaticanalyzer}/clangstaticanalyzerlogfilereader/tst_clangstaticanalyzerlogfilereader.cpp (100%)
rename {src/plugins/clangstaticanalyzer/tests => tests/auto/clangstaticanalyzer}/clangstaticanalyzerrunner/clangstaticanalyzerrunner.pro (85%)
rename {src/plugins/clangstaticanalyzer/tests => tests/auto/clangstaticanalyzer}/clangstaticanalyzerrunner/clangstaticanalyzerrunner.qbs (100%)
rename {src/plugins/clangstaticanalyzer/tests => tests/auto/clangstaticanalyzer}/clangstaticanalyzerrunner/tst_clangstaticanalyzerrunner.cpp (100%)
create mode 100644 tests/auto/clangstaticanalyzer/clangstaticanalyzertest.pri
diff --git a/src/plugins/clangstaticanalyzer/tests/tests.pri b/src/plugins/clangstaticanalyzer/tests/tests.pri
deleted file mode 100644
index 8975fc8448..0000000000
--- a/src/plugins/clangstaticanalyzer/tests/tests.pri
+++ /dev/null
@@ -1,22 +0,0 @@
-QTC_LIB_DEPENDS += utils
-QTC_PLUGIN_DEPENDS += analyzerbase
-
-isEmpty(IDE_SOURCE_TREE): IDE_SOURCE_TREE=$$(QTC_SOURCE)
-isEmpty(IDE_BUILD_TREE): IDE_BUILD_TREE=$$(QTC_BUILD)
-isEmpty(IDE_SOURCE_TREE): error(Set QTC_SOURCE environment variable)
-isEmpty(IDE_BUILD_TREE): error(Set QTC_BUILD environment variable)
-
-PLUGINDIR = $$PWD/..
-INCLUDEPATH += $$PLUGINDIR/..
-
-include($$IDE_SOURCE_TREE/qtcreator.pri)
-include($$IDE_SOURCE_TREE/tests/auto/qttestrpath.pri)
-
-QT += testlib
-QT -= gui
-
-CONFIG += console
-CONFIG += testcase
-CONFIG -= app_bundle
-
-TEMPLATE = app
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 229f962899..1d036116eb 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -3,6 +3,7 @@ TEMPLATE = subdirs
SUBDIRS += \
aggregation \
changeset \
+ clangstaticanalyzer \
cplusplus \
debugger \
diff \
diff --git a/tests/auto/auto.qbs b/tests/auto/auto.qbs
index 27a19798a8..6b1b308442 100644
--- a/tests/auto/auto.qbs
+++ b/tests/auto/auto.qbs
@@ -6,6 +6,7 @@ Project {
references: [
"aggregation/aggregation.qbs",
"changeset/changeset.qbs",
+ "clangstaticanalyzer/clangstaticanalyzer.qbs",
"cplusplus/cplusplus.qbs",
"debugger/debugger.qbs",
"diff/diff.qbs",
diff --git a/src/plugins/clangstaticanalyzer/tests/tests.pro b/tests/auto/clangstaticanalyzer/clangstaticanalyzer.pro
similarity index 100%
rename from src/plugins/clangstaticanalyzer/tests/tests.pro
rename to tests/auto/clangstaticanalyzer/clangstaticanalyzer.pro
diff --git a/src/plugins/clangstaticanalyzer/tests/tests.qbs b/tests/auto/clangstaticanalyzer/clangstaticanalyzer.qbs
similarity index 75%
rename from src/plugins/clangstaticanalyzer/tests/tests.qbs
rename to tests/auto/clangstaticanalyzer/clangstaticanalyzer.qbs
index a6dc94d66c..e9ee45d733 100644
--- a/src/plugins/clangstaticanalyzer/tests/tests.qbs
+++ b/tests/auto/clangstaticanalyzer/clangstaticanalyzer.qbs
@@ -1,6 +1,7 @@
import qbs
Project {
+ name: "ClangStaticAnalyzer autotests"
references: [
"clangstaticanalyzerlogfilereader",
"clangstaticanalyzerrunner",
diff --git a/src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerautotest.qbs b/tests/auto/clangstaticanalyzer/clangstaticanalyzerautotest.qbs
similarity index 73%
rename from src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerautotest.qbs
rename to tests/auto/clangstaticanalyzer/clangstaticanalyzerautotest.qbs
index 88dfcb32a1..2baf9b8c7f 100644
--- a/src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerautotest.qbs
+++ b/tests/auto/clangstaticanalyzer/clangstaticanalyzerautotest.qbs
@@ -5,7 +5,7 @@ QtcAutotest {
Depends { name: "AnalyzerBase" }
Depends { name: "Utils" }
- property path pluginDir: "../../"
+ property path pluginDir: project.ide_source_tree + "/src/plugins/clangstaticanalyzer"
cpp.defines: base.concat('SRCDIR="' + sourceDirectory + '"')
cpp.includePaths: base.concat(pluginDir + "/..")
}
diff --git a/src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerlogfilereader/clangstaticanalyzerlogfilereader.pro b/tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/clangstaticanalyzerlogfilereader.pro
similarity index 90%
rename from src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerlogfilereader/clangstaticanalyzerlogfilereader.pro
rename to tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/clangstaticanalyzerlogfilereader.pro
index d9dda64f85..4a1f96e77f 100644
--- a/src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerlogfilereader/clangstaticanalyzerlogfilereader.pro
+++ b/tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/clangstaticanalyzerlogfilereader.pro
@@ -1,4 +1,4 @@
-include(../tests.pri)
+include(../clangstaticanalyzertest.pri)
TARGET = tst_clangstaticanalyzerlogfilereader
diff --git a/src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerlogfilereader/clangstaticanalyzerlogfilereader.qbs b/tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/clangstaticanalyzerlogfilereader.qbs
similarity index 100%
rename from src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerlogfilereader/clangstaticanalyzerlogfilereader.qbs
rename to tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/clangstaticanalyzerlogfilereader.qbs
diff --git a/src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerlogfilereader/data/noDiagnostics.plist b/tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/data/noDiagnostics.plist
similarity index 100%
rename from src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerlogfilereader/data/noDiagnostics.plist
rename to tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/data/noDiagnostics.plist
diff --git a/src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerlogfilereader/data/someDiagnostics.plist b/tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/data/someDiagnostics.plist
similarity index 100%
rename from src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerlogfilereader/data/someDiagnostics.plist
rename to tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/data/someDiagnostics.plist
diff --git a/src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerlogfilereader/tst_clangstaticanalyzerlogfilereader.cpp b/tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/tst_clangstaticanalyzerlogfilereader.cpp
similarity index 100%
rename from src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerlogfilereader/tst_clangstaticanalyzerlogfilereader.cpp
rename to tests/auto/clangstaticanalyzer/clangstaticanalyzerlogfilereader/tst_clangstaticanalyzerlogfilereader.cpp
diff --git a/src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerrunner/clangstaticanalyzerrunner.pro b/tests/auto/clangstaticanalyzer/clangstaticanalyzerrunner/clangstaticanalyzerrunner.pro
similarity index 85%
rename from src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerrunner/clangstaticanalyzerrunner.pro
rename to tests/auto/clangstaticanalyzer/clangstaticanalyzerrunner/clangstaticanalyzerrunner.pro
index b19bae4092..1331b22103 100644
--- a/src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerrunner/clangstaticanalyzerrunner.pro
+++ b/tests/auto/clangstaticanalyzer/clangstaticanalyzerrunner/clangstaticanalyzerrunner.pro
@@ -1,4 +1,4 @@
-include(../tests.pri)
+include(../clangstaticanalyzertest.pri)
TARGET = tst_clangstaticanalyzerrunnertest
diff --git a/src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerrunner/clangstaticanalyzerrunner.qbs b/tests/auto/clangstaticanalyzer/clangstaticanalyzerrunner/clangstaticanalyzerrunner.qbs
similarity index 100%
rename from src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerrunner/clangstaticanalyzerrunner.qbs
rename to tests/auto/clangstaticanalyzer/clangstaticanalyzerrunner/clangstaticanalyzerrunner.qbs
diff --git a/src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerrunner/tst_clangstaticanalyzerrunner.cpp b/tests/auto/clangstaticanalyzer/clangstaticanalyzerrunner/tst_clangstaticanalyzerrunner.cpp
similarity index 100%
rename from src/plugins/clangstaticanalyzer/tests/clangstaticanalyzerrunner/tst_clangstaticanalyzerrunner.cpp
rename to tests/auto/clangstaticanalyzer/clangstaticanalyzerrunner/tst_clangstaticanalyzerrunner.cpp
diff --git a/tests/auto/clangstaticanalyzer/clangstaticanalyzertest.pri b/tests/auto/clangstaticanalyzer/clangstaticanalyzertest.pri
new file mode 100644
index 0000000000..e09c2e7fc6
--- /dev/null
+++ b/tests/auto/clangstaticanalyzer/clangstaticanalyzertest.pri
@@ -0,0 +1,5 @@
+QTC_LIB_DEPENDS += utils
+QTC_PLUGIN_DEPENDS += analyzerbase
+include(../qttest.pri)
+
+PLUGINDIR=$$IDE_SOURCE_TREE/src/plugins/clangstaticanalyzer
--
GitLab