Skip to content

Commit 3973bef

Browse files
authored
refactor: Move test directory into src/iceberg tree (#247)
1 parent a89b101 commit 3973bef

File tree

71 files changed

+9
-8
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+9
-8
lines changed

.github/.licenserc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ header:
3030
- 'NOTICE'
3131
- 'src/iceberg/expected.h'
3232
- 'src/iceberg/util/murmurhash3_internal.*'
33-
- 'test/resources/**'
33+
- 'src/iceberg/test/resources/**'
3434

3535
comment: on-failure

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ repos:
3333
rev: v20.1.8
3434
hooks:
3535
- id: clang-format
36-
exclude: ^test/resources/.*\.json$
36+
exclude: ^src/iceberg/test/resources/.*\.json$
3737

3838
- repo: https://github.com/cheshirekow/cmake-format-precommit
3939
rev: v0.6.10

CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,9 @@ include(IcebergSanitizer)
6666
include(IcebergThirdpartyToolchain)
6767
include(GenerateExportHeader)
6868

69-
add_subdirectory(src)
70-
7169
if(ICEBERG_BUILD_TESTS)
7270
enable_testing()
73-
add_subdirectory(test)
7471
endif()
7572

73+
add_subdirectory(src)
7674
install(FILES LICENSE NOTICE DESTINATION ${ICEBERG_INSTALL_DOCDIR})

src/iceberg/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,3 +182,7 @@ if(ICEBERG_BUILD_BUNDLE)
182182
endif()
183183

184184
iceberg_install_cmake_package(Iceberg iceberg_targets)
185+
186+
if(ICEBERG_BUILD_TESTS)
187+
add_subdirectory(test)
188+
endif()

test/CMakeLists.txt renamed to src/iceberg/test/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@ fetchcontent_declare(googletest
2323
GTest)
2424
fetchcontent_makeavailable(googletest)
2525

26-
set(ICEBERG_TEST_RESOURCES "${CMAKE_SOURCE_DIR}/test/resources")
26+
set(ICEBERG_TEST_RESOURCES "${CMAKE_SOURCE_DIR}/src/iceberg/test/resources")
2727

28-
configure_file("${CMAKE_SOURCE_DIR}/test/test_config.h.in"
29-
"${CMAKE_BINARY_DIR}/iceberg/test/test_config.h")
28+
configure_file("test_config.h.in" "test_config.h")
3029

3130
function(add_iceberg_test test_name)
3231
set(options USE_BUNDLE)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)