Skip to content

Commit 09fcf29

Browse files
committed
Fix tests/CMakeLists.txt after rebase: align with upstream/main
Signed-off-by: Mikael Sundell <[email protected]>
1 parent 0471ab5 commit 09fcf29

File tree

3 files changed

+36
-21
lines changed

3 files changed

+36
-21
lines changed

tests/CMakeLists.txt

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,35 +18,35 @@ endif()
1818
################################################################################
1919

2020
add_executable (
21-
Test_core_usage
22-
core_usage.cpp
21+
Test_usage_example_core
22+
usage_example_core.cpp
2323
)
2424

2525
target_link_libraries(
26-
Test_core_usage
26+
Test_usage_example_core
2727
PUBLIC
2828
${RAWTOACES_CORE_LIB}
2929
OpenImageIO::OpenImageIO
3030
)
3131

32-
setup_test_coverage(Test_core_usage)
33-
add_test ( NAME Test_core_usage COMMAND Test_core_usage )
32+
setup_test_coverage(Test_usage_example_core)
33+
add_test ( NAME Test_usage_example_core COMMAND Test_usage_example_core )
3434

3535
################################################################################
3636
add_executable (
37-
Test_util_usage
38-
util_usage.cpp
37+
Test_usage_example_util
38+
usage_example_util.cpp
3939
)
4040

4141
target_link_libraries(
42-
Test_util_usage
42+
Test_usage_example_util
4343
PUBLIC
4444
${RAWTOACES_UTIL_LIB}
4545
OpenImageIO::OpenImageIO
4646
)
4747

48-
setup_test_coverage(Test_util_usage)
49-
add_test ( NAME Test_util_usage COMMAND Test_util_usage )
48+
setup_test_coverage(Test_usage_example_util)
49+
add_test ( NAME Test_usage_example_util COMMAND Test_usage_example_util )
5050

5151
################################################################################
5252
add_executable (
@@ -183,7 +183,22 @@ target_link_libraries(
183183
setup_test_coverage(Test_UsageTimer)
184184
add_test ( NAME Test_UsageTimer COMMAND Test_UsageTimer )
185185

186+
################################################################################
186187

188+
add_executable (
189+
Test_ImageConverter
190+
test_image_converter.cpp
191+
)
192+
193+
target_link_libraries(
194+
Test_ImageConverter
195+
PUBLIC
196+
${RAWTOACES_UTIL_LIB}
197+
OpenImageIO::OpenImageIO
198+
)
199+
200+
setup_test_coverage(Test_ImageConverter)
201+
add_test ( NAME Test_ImageConverter COMMAND Test_ImageConverter )
187202

188203
################################################################################
189204
# Coverage report generation
@@ -193,4 +208,4 @@ if( ENABLE_COVERAGE AND COVERAGE_SUPPORTED )
193208
add_subdirectory(config_tests/util)
194209

195210
generate_coverage_report()
196-
endif()
211+
endif()

tests/config_tests/core/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ cmake_minimum_required(VERSION 3.10)
44

55
enable_testing()
66

7-
add_executable( test_core
8-
core_test.cpp
7+
add_executable( test_installed_core
8+
test_installed_core.cpp
99
)
1010

1111
target_link_libraries(
12-
test_core
12+
test_installed_core
1313
PUBLIC
1414
rawtoaces_core
1515
OpenImageIO::OpenImageIO
1616
)
1717

1818
# Enable coverage for this test if coverage is enabled
1919
if( ENABLE_COVERAGE AND COVERAGE_SUPPORTED )
20-
setup_coverage_flags(test_core)
20+
setup_coverage_flags(test_installed_core)
2121
endif()
2222

23-
add_test ( NAME test_core COMMAND test_core )
23+
add_test ( NAME test_installed_core COMMAND test_installed_core )

tests/config_tests/util/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ cmake_minimum_required(VERSION 3.10)
44

55
enable_testing()
66

7-
add_executable( test_util
8-
util_test.cpp
7+
add_executable( test_installed_util
8+
test_installed_util.cpp
99
)
1010

1111
target_link_libraries(
12-
test_util
12+
test_installed_util
1313
PUBLIC
1414
rawtoaces_util
1515
OpenImageIO::OpenImageIO
1616
)
1717

1818
# Enable coverage for this test if coverage is enabled
1919
if( ENABLE_COVERAGE AND COVERAGE_SUPPORTED )
20-
setup_coverage_flags(test_util)
20+
setup_coverage_flags(test_installed_util)
2121
endif()
2222

23-
add_test ( NAME test_util COMMAND test_util )
23+
add_test ( NAME test_installed_util COMMAND test_installed_util )

0 commit comments

Comments
 (0)