Commit 143983a8 authored by Nikolai Kosjar's avatar Nikolai Kosjar

Clang: Tests: Move test data into test/data

Change-Id: Ib33cec849ffd575d8b0bf87c6969170af4cd30d3
Reviewed-by: default avatarMarco Bubke <marco.bubke@theqtcompany.com>
parent 08bf7618
......@@ -115,23 +115,14 @@ contains(DEFINES, CLANG_INDEXING) {
FORMS += clangprojectsettingspropertiespage.ui
equals(TEST, 1) {
RESOURCES += \
test/clang_tests_database.qrc
HEADERS += \
test/clangcodecompletion_test.h
SOURCES += \
test/clangcodecompletion_test.cpp
DISTFILES += \
test/mysource.cpp \
test/myheader.cpp \
test/completionWithProject.cpp \
test/memberCompletion.cpp \
test/doxygenKeywordsCompletion.cpp \
test/preprocessorKeywordsCompletion.cpp \
test/includeDirectiveCompletion.cpp
RESOURCES += test/data/clangtestdata.qrc
OTHER_FILES += $$files(test/data/*)
}
macx {
......
......@@ -104,7 +104,7 @@ QtcPlugin {
condition: project.testsEnabled
prefix: "test/"
files: [
"clang_tests_database.qrc",
"data/clangtestdata.qrc",
"clangcodecompletion_test.cpp",
"clangcodecompletion_test.h",
]
......@@ -112,20 +112,10 @@ QtcPlugin {
Group {
name: "Test resources"
prefix: "test/"
prefix: "test/data/"
fileTags: "none"
files: [
"mysource.cpp",
"myheader.h",
"completionWithProject.cpp",
"memberCompletion.cpp",
"doxygenKeywordsCompletion.cpp",
"preprocessorKeywordsCompletion.cpp",
"includeDirectiveCompletion.cpp",
"objc_messages_1.mm",
"objc_messages_2.mm",
"objc_messages_3.mm",
]
files: [ "*" ]
excludeFiles: "clangtestdata.qrc"
}
files: [
......
<RCC>
<qresource prefix="/unittests/ClangCodeModel">
<file>objc_messages_1.mm</file>
<file>objc_messages_2.mm</file>
<file>objc_messages_3.mm</file>
<file>completionWithProject.cpp</file>
<file>memberCompletion.cpp</file>
<file>myheader.h</file>
<file>mysource.cpp</file>
<file>qt-widgets-app/main.cpp</file>
<file>qt-widgets-app/mainwindow.cpp</file>
<file>qt-widgets-app/mainwindow.h</file>
<file>qt-widgets-app/mainwindow.ui</file>
<file>qt-widgets-app/qt-widgets-app.pro</file>
<file>functionCompletion.cpp</file>
<file>doxygenKeywordsCompletion.cpp</file>
<file>preprocessorKeywordsCompletion.cpp</file>
<file>includeDirectiveCompletion.cpp</file>
<file>exampleIncludeDir/file.h</file>
<file>exampleIncludeDir/otherFile.h</file>
<file>exampleIncludeDir/mylib/mylib.h</file>
<file>globalCompletion.cpp</file>
<file>exampleIncludeDir/otherFile.h</file>
<file>completionWithProject.cpp</file>
<file>constructorCompletion.cpp</file>
<file>doxygenKeywordsCompletion.cpp</file>
<file>functionCompletion.cpp</file>
<file>globalCompletion.cpp</file>
<file>includeDirectiveCompletion.cpp</file>
<file>memberCompletion.cpp</file>
<file>myheader.h</file>
<file>mysource.cpp</file>
<file>objc_messages_1.mm</file>
<file>objc_messages_2.mm</file>
<file>objc_messages_3.mm</file>
<file>preprocessorKeywordsCompletion.cpp</file>
</qresource>
</RCC>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment