Skip to content

Commit 570c29a

Browse files
author
Gianfranco Costamagna
committed
sed s/git_required/internet_required/g to make sure people understand that the test requires an active connection
1 parent bd0c22f commit 570c29a

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1881,10 +1881,10 @@ json/tests/src/make_test_data_available.hpp:23: FATAL ERROR: REQUIRE( utils::che
18811881
===============================================================================
18821882
```
18831883

1884-
In case you have downloaded the library rather than checked out the code via Git, test `cmake_fetch_content_configure` will fail. Please execute `ctest -LE git_required` to skip these tests. See [issue #2189](https://github.com/nlohmann/json/issues/2189) for more information.
1884+
In case you have downloaded the library rather than checked out the code via Git, test `cmake_fetch_content_configure` will fail. Please execute `ctest -LE internet_required` to skip these tests. See [issue #2189](https://github.com/nlohmann/json/issues/2189) for more information.
18851885

18861886
Some tests change the installed files and hence make the whole process not reproducible. Please execute `ctest -LE not_reproducible` to skip these tests. See [issue #2324](https://github.com/nlohmann/json/issues/2324) for more information. Furthermore, assertions must be switched off to ensure reproducible builds (see [discussion 4494](https://github.com/nlohmann/json/discussions/4494)).
18871887

1888-
Note you need to call `cmake -LE "not_reproducible|git_required"` to exclude both labels. See [issue #2596](https://github.com/nlohmann/json/issues/2596) for more information.
1888+
Note you need to call `cmake -LE "not_reproducible|internet_required"` to exclude both labels. See [issue #2596](https://github.com/nlohmann/json/issues/2596) for more information.
18891889

18901890
As Intel compilers use unsafe floating point optimization by default, the unit tests may fail. Use flag [`/fp:precise`](https://www.intel.com/content/www/us/en/docs/cpp-compiler/developer-guide-reference/2021-8/fp-model-fp.html) then.

cmake/ci.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ add_custom_target(ci_non_git_tests
477477
-DJSON_BuildTests=ON -DJSON_FastTests=ON
478478
-S${PROJECT_BINARY_DIR}/build_non_git_tests/sources -B${PROJECT_BINARY_DIR}/build_non_git_tests
479479
COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_non_git_tests
480-
COMMAND cd ${PROJECT_BINARY_DIR}/build_non_git_tests && ${CMAKE_CTEST_COMMAND} --parallel ${N} -LE git_required --output-on-failure
480+
COMMAND cd ${PROJECT_BINARY_DIR}/build_non_git_tests && ${CMAKE_CTEST_COMMAND} --parallel ${N} -LE internet_required --output-on-failure
481481
COMMENT "Check code when project was not checked out from Git"
482482
)
483483

@@ -643,7 +643,7 @@ add_custom_target(ci_test_compiler_default
643643
-S${PROJECT_SOURCE_DIR} -B${PROJECT_BINARY_DIR}/build_compiler_default
644644
${ADDITIONAL_FLAGS}
645645
COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/build_compiler_default --parallel ${N}
646-
COMMAND cd ${PROJECT_BINARY_DIR}/build_compiler_default && ${CMAKE_CTEST_COMMAND} --parallel ${N} --exclude-regex "test-unicode" -LE git_required --output-on-failure
646+
COMMAND cd ${PROJECT_BINARY_DIR}/build_compiler_default && ${CMAKE_CTEST_COMMAND} --parallel ${N} --exclude-regex "test-unicode" -LE internet_required --output-on-failure
647647
COMMENT "Compile and test with default C++ compiler"
648648
)
649649

tests/cmake_fetch_content/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ if (${CMAKE_VERSION} VERSION_GREATER "3.11.0")
1212
)
1313
set_tests_properties(cmake_fetch_content_configure PROPERTIES
1414
FIXTURES_SETUP cmake_fetch_content
15-
LABELS "git_required;not_reproducible"
15+
LABELS "internet_required;not_reproducible"
1616
)
1717
set_tests_properties(cmake_fetch_content_build PROPERTIES
1818
FIXTURES_REQUIRED cmake_fetch_content
19-
LABELS "git_required;not_reproducible"
19+
LABELS "internet_required;not_reproducible"
2020
)
2121
endif()

tests/cmake_fetch_content2/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ if (${CMAKE_VERSION} VERSION_GREATER "3.14.0")
1212
)
1313
set_tests_properties(cmake_fetch_content2_configure PROPERTIES
1414
FIXTURES_SETUP cmake_fetch_content2
15-
LABELS "git_required;not_reproducible"
15+
LABELS "internet_required;not_reproducible"
1616
)
1717
set_tests_properties(cmake_fetch_content2_build PROPERTIES
1818
FIXTURES_REQUIRED cmake_fetch_content2
19-
LABELS "git_required;not_reproducible"
19+
LABELS "internet_required;not_reproducible"
2020
)
2121
endif()

0 commit comments

Comments
 (0)