Skip to content

[vcpkg] Small touchups for vcpkg unit tests #11068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ras0219-msft merged 2 commits into from
Apr 29, 2020
Merged

[vcpkg] Small touchups for vcpkg unit tests #11068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c21107
Do not disable expression decomposition in some optional tests
horenmar Apr 26, 2020
e83051a
Run tests in random order
horenmar Apr 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion toolsrc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ if (BUILD_TESTING)

enable_testing()
add_executable(vcpkg-test ${VCPKGTEST_SOURCES} $<TARGET_OBJECTS:vcpkglib>)
add_test(NAME default COMMAND vcpkg-test)
add_test(NAME default COMMAND vcpkg-test --order rand --rng-seed time)

if (VCPKG_BUILD_BENCHMARKING)
target_compile_options(vcpkg-test PRIVATE -DCATCH_CONFIG_ENABLE_BENCHMARKING)
Expand Down
6 changes: 3 additions & 3 deletions toolsrc/src/vcpkg-test/optional.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ TEST_CASE ("equal", "[optional]")
using vcpkg::Optional;

CHECK(Optional<int>{} == Optional<int>{});
CHECK(!(Optional<int>{} == Optional<int>{42}));
CHECK(!(Optional<int>{42} == Optional<int>{}));
CHECK(!(Optional<int>{1729} == Optional<int>{42}));
CHECK_FALSE(Optional<int>{} == Optional<int>{42});
CHECK_FALSE(Optional<int>{42} == Optional<int>{});
CHECK_FALSE(Optional<int>{1729} == Optional<int>{42});
CHECK(Optional<int>{42} == Optional<int>{42});
}

Expand Down