fix(tests): repair stale TestFile.h includes and stop hardcoding g++ in test CMakeLists (#551)
PR #550 moved TestFile.h from Tests/TactilityCore to Tests/Tactility, but AppManifestParsingTest.cpp and PropertiesFileTest.cpp still include the old path, so the test build fails on main.
This commit is contained in:
@@ -2,7 +2,6 @@ project(TactilityTests)
|
|||||||
|
|
||||||
enable_language(C CXX ASM)
|
enable_language(C CXX ASM)
|
||||||
|
|
||||||
set(CMAKE_CXX_COMPILER g++)
|
|
||||||
|
|
||||||
file(GLOB_RECURSE TEST_SOURCES ${PROJECT_SOURCE_DIR}/Source/*.cpp)
|
file(GLOB_RECURSE TEST_SOURCES ${PROJECT_SOURCE_DIR}/Source/*.cpp)
|
||||||
add_executable(TactilityTests EXCLUDE_FROM_ALL ${TEST_SOURCES})
|
add_executable(TactilityTests EXCLUDE_FROM_ALL ${TEST_SOURCES})
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#include "../../TactilityCore/Source/TestFile.h"
|
#include "TestFile.h"
|
||||||
#include "../../Tactility/Private/Tactility/app/AppManifestParsing.h"
|
#include "../../Tactility/Private/Tactility/app/AppManifestParsing.h"
|
||||||
#include "../../Tactility/Private/Tactility/app/AppManifestParsingInternal.h"
|
#include "../../Tactility/Private/Tactility/app/AppManifestParsingInternal.h"
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#include "../../TactilityCore/Source/TestFile.h"
|
#include "TestFile.h"
|
||||||
#include "../../Tactility/Include/Tactility/file/PropertiesFile.h"
|
#include "../../Tactility/Include/Tactility/file/PropertiesFile.h"
|
||||||
|
|
||||||
#include "doctest.h"
|
#include "doctest.h"
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ project(TactilityFreeRtosTests)
|
|||||||
|
|
||||||
enable_language(C CXX ASM)
|
enable_language(C CXX ASM)
|
||||||
|
|
||||||
set(CMAKE_CXX_COMPILER g++)
|
|
||||||
|
|
||||||
file(GLOB_RECURSE TEST_SOURCES ${PROJECT_SOURCE_DIR}/Source/*.cpp)
|
file(GLOB_RECURSE TEST_SOURCES ${PROJECT_SOURCE_DIR}/Source/*.cpp)
|
||||||
add_executable(TactilityFreeRtosTests EXCLUDE_FROM_ALL ${TEST_SOURCES})
|
add_executable(TactilityFreeRtosTests EXCLUDE_FROM_ALL ${TEST_SOURCES})
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ project(TactilityKernelTests)
|
|||||||
|
|
||||||
enable_language(C CXX ASM)
|
enable_language(C CXX ASM)
|
||||||
|
|
||||||
set(CMAKE_CXX_COMPILER g++)
|
|
||||||
|
|
||||||
file(GLOB_RECURSE TEST_SOURCES ${PROJECT_SOURCE_DIR}/Source/*.cpp)
|
file(GLOB_RECURSE TEST_SOURCES ${PROJECT_SOURCE_DIR}/Source/*.cpp)
|
||||||
add_executable(TactilityKernelTests EXCLUDE_FROM_ALL ${TEST_SOURCES})
|
add_executable(TactilityKernelTests EXCLUDE_FROM_ALL ${TEST_SOURCES})
|
||||||
|
|||||||
@@ -2,8 +2,6 @@ project(CryptModuleTests)
|
|||||||
|
|
||||||
enable_language(C CXX ASM)
|
enable_language(C CXX ASM)
|
||||||
|
|
||||||
set(CMAKE_CXX_COMPILER g++)
|
|
||||||
|
|
||||||
file(GLOB_RECURSE TEST_SOURCES ${PROJECT_SOURCE_DIR}/Source/*.cpp)
|
file(GLOB_RECURSE TEST_SOURCES ${PROJECT_SOURCE_DIR}/Source/*.cpp)
|
||||||
add_executable(CryptModuleTests EXCLUDE_FROM_ALL ${TEST_SOURCES})
|
add_executable(CryptModuleTests EXCLUDE_FROM_ALL ${TEST_SOURCES})
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user