-
-
Notifications
You must be signed in to change notification settings - Fork 161
Commit
- removed submodules in `external/` - vendored `Catch2` and `nlohmann/json directly` - updated conformance test generator to look outside the repo for test sources
- Loading branch information
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -63,3 +63,5 @@ meson.build text eol=lf encoding=UTF-8 | |
*.psd binary | ||
*.rc binary | ||
*.xlsx binary | ||
|
||
vendor/* linguist-vendored |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +0,0 @@ | ||
[submodule "external/toml-test"] | ||
path = external/toml-test | ||
url = https://github.com/BurntSushi/toml-test.git | ||
shallow = true | ||
[submodule "external/toml-spec-tests"] | ||
path = external/toml-spec-tests | ||
url = https://github.com/iarna/toml-spec-tests.git | ||
shallow = true | ||
[submodule "external/tloptional"] | ||
path = external/tloptional | ||
url = https://github.com/TartanLlama/optional.git | ||
shallow = true | ||
[submodule "external/json"] | ||
path = external/json | ||
url = https://github.com/nlohmann/json.git | ||
shallow = true | ||
[submodule "external/Catch2"] | ||
path = external/Catch2 | ||
url = https://github.com/catchorg/Catch2.git | ||
branch = v2.x | ||
shallow = true | ||
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,3 @@ | ||
{ | ||
"x": ["/external"], | ||
"requires": { | ||
"tipi-deps/Catch2@file://single_include": { "@": "v2.x" }, | ||
"nlohmann/json": { "@": "v3.10.5" } | ||
} | ||
"requires": {} | ||
} |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -33,29 +33,6 @@ test_deps = [tomlplusplus_dep] | |
|
||
fs = import('fs') | ||
|
||
catch2_dep = dependency('catch2', required: false) | ||
if catch2_dep.found() | ||
test_deps += catch2_dep | ||
elif fs.exists('..'/'external'/'Catch2'/'single_include') | ||
catch2_dep = declare_dependency(include_directories: '..'/'external'/'Catch2'/'single_include') | ||
test_deps += catch2_dep | ||
else | ||
error('Catch2 is missing! You probably need to fetch submodules ("git submodule update --init --depth 1 external/Catch2"') | ||
endif | ||
|
||
has_tl_optional = false | ||
tl_optional_dep = dependency('tl-optional', required: false) | ||
if tl_optional_dep.found() | ||
test_deps += tl_optional_dep | ||
has_tl_optional = true | ||
elif fs.exists('..'/'external'/'tloptional'/'include') | ||
tl_optional_dep = declare_dependency(include_directories: '..'/'external'/'tloptional'/'include') | ||
test_deps += tl_optional_dep | ||
has_tl_optional = true | ||
else | ||
warning('tl-optional not found, skipping its tests') | ||
endif | ||
|
||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
Tachi107
Contributor
|
||
####################################################################################################################### | ||
# fast math check | ||
####################################################################################################################### | ||
|
@@ -153,14 +130,6 @@ foreach cpp20 : cpp20_modes | |
and not get_option('compile_library') | ||
) | ||
|
||
# use tl::optional to test that the TOML_OPTIONAL_TYPE config option works as advertised | ||
tl_optional = ( | ||
test_counter % 2 == 1 | ||
and has_tl_optional | ||
and not get_option('compile_library') | ||
and exceptions # requires exceptions in its API | ||
) | ||
|
||
# use asan in the tests | ||
address_sanitizer = ( | ||
get_option('asan_tests') | ||
|
@@ -241,11 +210,6 @@ foreach cpp20 : cpp20_modes | |
test_args += '-DUSE_SINGLE_HEADER=1' | ||
endif | ||
|
||
if tl_optional | ||
test_args += '-DUSE_TARTANLLAMA_OPTIONAL=1' | ||
test_name = test_name + '_tlopt' | ||
endif | ||
|
||
test_executables += [[ | ||
test_name, | ||
executable( | ||
|
@Tachi107 I can't break meson's sandbox if I just vendor everything lmao