From 640600c1475f9e1163c04f53dcc0d72d1f0daf7e Mon Sep 17 00:00:00 2001 From: Alex Fabijanic Date: Mon, 19 Feb 2024 09:58:05 +0100 Subject: [PATCH] fix(DataTest): move to Data directory --- .vscode/c_cpp_properties.json | 2 +- Data/CMakeLists.txt | 1 + Data/Data.progen | 2 +- Data/{testsuite => }/DataTest/CMakeLists.txt | 1 - Data/{testsuite => }/DataTest/DataTest.progen | 0 .../DataTest/DataTest_VS90.vcproj | 0 .../DataTest/DataTest_vs160.vcxproj | 0 .../DataTest/DataTest_vs160.vcxproj.filters | 0 .../DataTest/DataTest_vs170.vcxproj | 0 .../DataTest/DataTest_vs170.vcxproj.filters | 0 Data/{testsuite => }/DataTest/Makefile | 2 +- .../DataTest/cmake/PocoDataTestConfig.cmake | 0 Data/{testsuite => }/DataTest/dependencies | 0 .../include/Poco/Data/Test/DataTest.h | 0 .../include/Poco/Data/Test/SQLExecutor.h | 0 .../DataTest/src/SQLExecutor.cpp | 0 Data/MySQL/testsuite/CMakeLists.txt | 2 +- Data/ODBC/testsuite/CMakeLists.txt | 2 +- Data/ODBC/testsuite/Makefile | 2 +- Data/ODBC/testsuite/TestSuite.progen | 2 +- Data/ODBC/testsuite/TestSuite_vs160.vcxproj | 24 ++++++------- Data/ODBC/testsuite/TestSuite_vs170.vcxproj | 36 +++++++++---------- Data/PostgreSQL/testsuite/CMakeLists.txt | 2 +- Data/PostgreSQL/testsuite/Makefile | 2 +- Data/SQLite/testsuite/CMakeLists.txt | 4 +-- Data/dependencies | 1 + Data/extradirs | 2 +- Data/testsuite/CMakeLists.txt | 2 -- Data/testsuite/Makefile | 2 +- Makefile | 2 +- buildwin.ps1 | 2 +- progen.ps1 | 4 +-- 32 files changed, 49 insertions(+), 50 deletions(-) rename Data/{testsuite => }/DataTest/CMakeLists.txt (95%) rename Data/{testsuite => }/DataTest/DataTest.progen (100%) rename Data/{testsuite => }/DataTest/DataTest_VS90.vcproj (100%) rename Data/{testsuite => }/DataTest/DataTest_vs160.vcxproj (100%) rename Data/{testsuite => }/DataTest/DataTest_vs160.vcxproj.filters (100%) rename Data/{testsuite => }/DataTest/DataTest_vs170.vcxproj (100%) rename Data/{testsuite => }/DataTest/DataTest_vs170.vcxproj.filters (100%) rename Data/{testsuite => }/DataTest/Makefile (84%) rename Data/{testsuite => }/DataTest/cmake/PocoDataTestConfig.cmake (100%) rename Data/{testsuite => }/DataTest/dependencies (100%) rename Data/{testsuite => }/DataTest/include/Poco/Data/Test/DataTest.h (100%) rename Data/{testsuite => }/DataTest/include/Poco/Data/Test/SQLExecutor.h (100%) rename Data/{testsuite => }/DataTest/src/SQLExecutor.cpp (100%) diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index b7c6a74e5..50187f009 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -24,7 +24,7 @@ "${POCO_BASE}/MongoDB/include", "${POCO_BASE}/ApacheConnector/include", "${POCO_BASE}/Data/src", - "${POCO_BASE}/Data/testsuite/DataTest/include" + "${POCO_BASE}/Data/DataTest/include" ] }, "configurations": [ diff --git a/Data/CMakeLists.txt b/Data/CMakeLists.txt index 87f0ee58a..95e5019b3 100644 --- a/Data/CMakeLists.txt +++ b/Data/CMakeLists.txt @@ -61,6 +61,7 @@ POCO_INSTALL(Data) POCO_GENERATE_PACKAGE(Data) if(ENABLE_TESTS) + add_subdirectory(DataTest) add_subdirectory(testsuite) endif() diff --git a/Data/Data.progen b/Data/Data.progen index 2333d1f8c..0701b376c 100644 --- a/Data/Data.progen +++ b/Data/Data.progen @@ -15,4 +15,4 @@ vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared} vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared} vc.project.compiler.additionalOptions = /bigobj /Zc:__cplusplus vc.solution.create = true -vc.solution.include = testsuite\\TestSuite,testsuite\\DataTest\\DataTest +vc.solution.include = testsuite\\TestSuite,DataTest\\DataTest diff --git a/Data/testsuite/DataTest/CMakeLists.txt b/Data/DataTest/CMakeLists.txt similarity index 95% rename from Data/testsuite/DataTest/CMakeLists.txt rename to Data/DataTest/CMakeLists.txt index 0c04376c1..10a44858d 100644 --- a/Data/testsuite/DataTest/CMakeLists.txt +++ b/Data/DataTest/CMakeLists.txt @@ -25,7 +25,6 @@ target_link_libraries(DataTest PUBLIC Poco::Data CppUnit) target_include_directories(DataTest PUBLIC $ - $ $ $ ) diff --git a/Data/testsuite/DataTest/DataTest.progen b/Data/DataTest/DataTest.progen similarity index 100% rename from Data/testsuite/DataTest/DataTest.progen rename to Data/DataTest/DataTest.progen diff --git a/Data/testsuite/DataTest/DataTest_VS90.vcproj b/Data/DataTest/DataTest_VS90.vcproj similarity index 100% rename from Data/testsuite/DataTest/DataTest_VS90.vcproj rename to Data/DataTest/DataTest_VS90.vcproj diff --git a/Data/testsuite/DataTest/DataTest_vs160.vcxproj b/Data/DataTest/DataTest_vs160.vcxproj similarity index 100% rename from Data/testsuite/DataTest/DataTest_vs160.vcxproj rename to Data/DataTest/DataTest_vs160.vcxproj diff --git a/Data/testsuite/DataTest/DataTest_vs160.vcxproj.filters b/Data/DataTest/DataTest_vs160.vcxproj.filters similarity index 100% rename from Data/testsuite/DataTest/DataTest_vs160.vcxproj.filters rename to Data/DataTest/DataTest_vs160.vcxproj.filters diff --git a/Data/testsuite/DataTest/DataTest_vs170.vcxproj b/Data/DataTest/DataTest_vs170.vcxproj similarity index 100% rename from Data/testsuite/DataTest/DataTest_vs170.vcxproj rename to Data/DataTest/DataTest_vs170.vcxproj diff --git a/Data/testsuite/DataTest/DataTest_vs170.vcxproj.filters b/Data/DataTest/DataTest_vs170.vcxproj.filters similarity index 100% rename from Data/testsuite/DataTest/DataTest_vs170.vcxproj.filters rename to Data/DataTest/DataTest_vs170.vcxproj.filters diff --git a/Data/testsuite/DataTest/Makefile b/Data/DataTest/Makefile similarity index 84% rename from Data/testsuite/DataTest/Makefile rename to Data/DataTest/Makefile index e84fc2454..28ba19b27 100644 --- a/Data/testsuite/DataTest/Makefile +++ b/Data/DataTest/Makefile @@ -11,6 +11,6 @@ objects = SQLExecutor target = PocoDataTest target_version = 1 target_libs = PocoData PocoFoundation CppUnit -target_includes = $(POCO_BASE)/Data/SQLParser $(POCO_BASE)/Data/SQLParser/src $(POCO_BASE)/Data/testsuite/DataTest/include +target_includes = $(POCO_BASE)/Data/SQLParser $(POCO_BASE)/Data/SQLParser/src $(POCO_BASE)/Data/DataTest/include include $(POCO_BASE)/build/rules/lib diff --git a/Data/testsuite/DataTest/cmake/PocoDataTestConfig.cmake b/Data/DataTest/cmake/PocoDataTestConfig.cmake similarity index 100% rename from Data/testsuite/DataTest/cmake/PocoDataTestConfig.cmake rename to Data/DataTest/cmake/PocoDataTestConfig.cmake diff --git a/Data/testsuite/DataTest/dependencies b/Data/DataTest/dependencies similarity index 100% rename from Data/testsuite/DataTest/dependencies rename to Data/DataTest/dependencies diff --git a/Data/testsuite/DataTest/include/Poco/Data/Test/DataTest.h b/Data/DataTest/include/Poco/Data/Test/DataTest.h similarity index 100% rename from Data/testsuite/DataTest/include/Poco/Data/Test/DataTest.h rename to Data/DataTest/include/Poco/Data/Test/DataTest.h diff --git a/Data/testsuite/DataTest/include/Poco/Data/Test/SQLExecutor.h b/Data/DataTest/include/Poco/Data/Test/SQLExecutor.h similarity index 100% rename from Data/testsuite/DataTest/include/Poco/Data/Test/SQLExecutor.h rename to Data/DataTest/include/Poco/Data/Test/SQLExecutor.h diff --git a/Data/testsuite/DataTest/src/SQLExecutor.cpp b/Data/DataTest/src/SQLExecutor.cpp similarity index 100% rename from Data/testsuite/DataTest/src/SQLExecutor.cpp rename to Data/DataTest/src/SQLExecutor.cpp diff --git a/Data/MySQL/testsuite/CMakeLists.txt b/Data/MySQL/testsuite/CMakeLists.txt index 6b979517e..c63586143 100644 --- a/Data/MySQL/testsuite/CMakeLists.txt +++ b/Data/MySQL/testsuite/CMakeLists.txt @@ -26,4 +26,4 @@ else() set_tests_properties(DataMySQL PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR}) endif() target_link_libraries(DataMySQL-testrunner PUBLIC Poco::DataMySQL Poco::DataTest CppUnit) -target_include_directories(DataMySQL-testrunner PUBLIC ${CMAKE_SOURCE_DIR}/Data/testsuite/DataTest/include/) +target_include_directories(DataMySQL-testrunner PUBLIC ${CMAKE_SOURCE_DIR}/Data/DataTest/include/) diff --git a/Data/ODBC/testsuite/CMakeLists.txt b/Data/ODBC/testsuite/CMakeLists.txt index 80d0af09f..aab06fef9 100644 --- a/Data/ODBC/testsuite/CMakeLists.txt +++ b/Data/ODBC/testsuite/CMakeLists.txt @@ -27,4 +27,4 @@ else() endif() target_link_libraries(DataODBC-testrunner PUBLIC Poco::DataTest Poco::DataODBC Poco::Data CppUnit) -target_include_directories(DataODBC-testrunner PUBLIC ${CMAKE_SOURCE_DIR}/Data/testsuite/DataTest/include/) +target_include_directories(DataODBC-testrunner PUBLIC ${CMAKE_SOURCE_DIR}/Data/DataTest/include/) diff --git a/Data/ODBC/testsuite/Makefile b/Data/ODBC/testsuite/Makefile index d935264f9..5c3fac557 100644 --- a/Data/ODBC/testsuite/Makefile +++ b/Data/ODBC/testsuite/Makefile @@ -42,6 +42,6 @@ endif target = testrunner target_version = 1 target_libs = PocoDataODBC PocoDataTest PocoData PocoFoundation CppUnit -target_includes += $(POCO_BASE)/Data/testsuite/DataTest/include +target_includes += $(POCO_BASE)/Data/DataTest/include include $(POCO_BASE)/build/rules/exec diff --git a/Data/ODBC/testsuite/TestSuite.progen b/Data/ODBC/testsuite/TestSuite.progen index 66b339f1d..109665568 100644 --- a/Data/ODBC/testsuite/TestSuite.progen +++ b/Data/ODBC/testsuite/TestSuite.progen @@ -6,5 +6,5 @@ vc.project.pocobase = ..\\..\\.. vc.project.platforms = Win32 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = TestSuite_vs90.vcproj -vc.project.compiler.include = ..\\..\\..\\CppUnit\\include;..\\..\\..\\Foundation\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\testsuite\\DataTest\\include +vc.project.compiler.include = ..\\..\\..\\CppUnit\\include;..\\..\\..\\Foundation\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\DataTest\\include vc.project.linker.dependencies = odbc32.lib odbccp32.lib iphlpapi.lib diff --git a/Data/ODBC/testsuite/TestSuite_vs160.vcxproj b/Data/ODBC/testsuite/TestSuite_vs160.vcxproj index daad0580d..b59cccc74 100644 --- a/Data/ODBC/testsuite/TestSuite_vs160.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_vs160.vcxproj @@ -235,7 +235,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -268,7 +268,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -296,7 +296,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -329,7 +329,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -357,7 +357,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -390,7 +390,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -418,7 +418,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -451,7 +451,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -479,7 +479,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -512,7 +512,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -540,7 +540,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -573,7 +573,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/ODBC/testsuite/TestSuite_vs170.vcxproj b/Data/ODBC/testsuite/TestSuite_vs170.vcxproj index 7a23c7c28..ea4315f5b 100644 --- a/Data/ODBC/testsuite/TestSuite_vs170.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_vs170.vcxproj @@ -343,7 +343,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -379,7 +379,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -410,7 +410,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -446,7 +446,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -477,7 +477,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -513,7 +513,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -544,7 +544,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -580,7 +580,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -611,7 +611,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -647,7 +647,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -678,7 +678,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -714,7 +714,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -745,7 +745,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -781,7 +781,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -812,7 +812,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -848,7 +848,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -879,7 +879,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -915,7 +915,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/PostgreSQL/testsuite/CMakeLists.txt b/Data/PostgreSQL/testsuite/CMakeLists.txt index f97bb9c7c..2cf63e505 100644 --- a/Data/PostgreSQL/testsuite/CMakeLists.txt +++ b/Data/PostgreSQL/testsuite/CMakeLists.txt @@ -18,4 +18,4 @@ add_test( ) set_tests_properties(DataPostgreSQL PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR}) target_link_libraries(DataPostgreSQL-testrunner PUBLIC Poco::DataPostgreSQL Poco::DataTest CppUnit) -target_include_directories(DataPostgreSQL-testrunner PUBLIC ${CMAKE_SOURCE_DIR}/Data/testsuite/DataTest/include/) +target_include_directories(DataPostgreSQL-testrunner PUBLIC ${CMAKE_SOURCE_DIR}/Data/DataTest/include/) diff --git a/Data/PostgreSQL/testsuite/Makefile b/Data/PostgreSQL/testsuite/Makefile index 989842919..e4190d664 100644 --- a/Data/PostgreSQL/testsuite/Makefile +++ b/Data/PostgreSQL/testsuite/Makefile @@ -20,6 +20,6 @@ endif target = testrunner target_version = 1 target_libs = PocoDataPostgreSQL PocoDataTest PocoData PocoFoundation CppUnit -target_includes += $(POCO_BASE)/Data/testsuite/DataTest/include +target_includes += $(POCO_BASE)/Data/DataTest/include include $(POCO_BASE)/build/rules/exec diff --git a/Data/SQLite/testsuite/CMakeLists.txt b/Data/SQLite/testsuite/CMakeLists.txt index c8d1785e8..219d0fa5c 100644 --- a/Data/SQLite/testsuite/CMakeLists.txt +++ b/Data/SQLite/testsuite/CMakeLists.txt @@ -4,7 +4,7 @@ POCO_SOURCES_AUTO(TEST_SRCS ${SRCS_G}) # Headers file(GLOB_RECURSE HDRS_G "src/*.h") -file(GLOB HDRS_E ${CMAKE_SOURCE_DIR}/Data/testsuite/DataTest/include/*.h) +file(GLOB HDRS_E ${CMAKE_SOURCE_DIR}/Data/DataTest/include/*.h) POCO_HEADERS_AUTO(TEST_SRCS ${HDRS_E}) POCO_SOURCES_AUTO_PLAT(TEST_SRCS OFF @@ -28,4 +28,4 @@ else() endif() target_link_libraries(DataSQLite-testrunner PUBLIC Poco::DataSQLite Poco::DataTest CppUnit) -target_include_directories(DataSQLite-testrunner PUBLIC ${CMAKE_SOURCE_DIR}/Data/testsuite/DataTest/include/) +target_include_directories(DataSQLite-testrunner PUBLIC ${CMAKE_SOURCE_DIR}/Data/DataTest/include/) diff --git a/Data/dependencies b/Data/dependencies index 2e8175e4e..aa770fb02 100644 --- a/Data/dependencies +++ b/Data/dependencies @@ -1 +1,2 @@ Foundation +DataTest diff --git a/Data/extradirs b/Data/extradirs index e15babe2b..a8169c377 100644 --- a/Data/extradirs +++ b/Data/extradirs @@ -1,2 +1,2 @@ SQLParser -testsuite/DataTest +DataTest diff --git a/Data/testsuite/CMakeLists.txt b/Data/testsuite/CMakeLists.txt index 79d6e7353..05ba576bb 100644 --- a/Data/testsuite/CMakeLists.txt +++ b/Data/testsuite/CMakeLists.txt @@ -34,5 +34,3 @@ if(NOT POCO_DATA_NO_SQL_PARSER) PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../SQLParser ) endif() - -add_subdirectory(DataTest) diff --git a/Data/testsuite/Makefile b/Data/testsuite/Makefile index f5397e1b7..f8d9bd1ba 100644 --- a/Data/testsuite/Makefile +++ b/Data/testsuite/Makefile @@ -8,4 +8,4 @@ clean distclean all: projects projects: $(MAKE) -f Makefile-testrunner $(MAKECMDGOALS) - $(MAKE) -C DataTest $(MAKECMDGOALS) + $(MAKE) -C ../DataTest $(MAKECMDGOALS) diff --git a/Makefile b/Makefile index dd714a4fa..f1aa06c40 100644 --- a/Makefile +++ b/Makefile @@ -247,7 +247,7 @@ Data-libexec: Foundation-libexec $(MAKE) -C $(POCO_BASE)/Data DataTest-libexec: Data-libexec - $(MAKE) -C $(POCO_BASE)/Data/testsuite/DataTest + $(MAKE) -C $(POCO_BASE)/Data/DataTest Data-tests: Data-libexec DataTest-libexec cppunit $(MAKE) -C $(POCO_BASE)/Data/testsuite diff --git a/buildwin.ps1 b/buildwin.ps1 index 9ff172a0b..80462a778 100644 --- a/buildwin.ps1 +++ b/buildwin.ps1 @@ -505,7 +505,7 @@ function BuildComponents([string] $extension, [string] $type) } elseif ($component -eq "Data") # special case for Data, which needs DataTest lib { - $vsTestProject = "$poco_base\$componentDir\testsuite\DataTest\DataTest$($suffix).$($extension)" + $vsTestProject = "$poco_base\$componentDir\DataTest\DataTest$($suffix).$($extension)" Write-Host "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" Write-Host "| Building $vsTestProject" Write-Host "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" diff --git a/progen.ps1 b/progen.ps1 index 4832923d2..7547de652 100644 --- a/progen.ps1 +++ b/progen.ps1 @@ -169,9 +169,9 @@ function InvokeProgenComponents([string] $type) if ($component -eq "Data") # special case for Data { - $componentTestProgenPath = "$poco_base\$componentDir\testsuite\DataTest\DataTest.progen" + $componentTestProgenPath = "$poco_base\$componentDir\DataTest\DataTest.progen" Write-Host "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" - Write-Host "| Running Progen for $componentDir\testsuite\DataTest" + Write-Host "| Running Progen for $componentDir\DataTest" Write-Host "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" InvokeProcess $progenPath "/tool=vs$vs $componentTestProgenPath" }