From 3c211078df4c4b425424e505bd2367741cfa2a37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?=
 <martin.horenovsky@gmail.com>
Date: Sun, 26 Apr 2020 21:31:29 +0200
Subject: [PATCH 1/2] Do not disable expression decomposition in some optional
 tests

The tests are trivial enough that it is unlikely to come useful,
but the old usage is bad practice.
---
 toolsrc/src/vcpkg-test/optional.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/toolsrc/src/vcpkg-test/optional.cpp b/toolsrc/src/vcpkg-test/optional.cpp
index ce728208f4585f..c2348c5c615a36 100644
--- a/toolsrc/src/vcpkg-test/optional.cpp
+++ b/toolsrc/src/vcpkg-test/optional.cpp
@@ -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});
 }
 

From e83051a03da648aaf65bf57c50ec9e824ed57e3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?=
 <martin.horenovsky@gmail.com>
Date: Tue, 28 Apr 2020 10:01:27 +0200
Subject: [PATCH 2/2] Run tests in random order

This should prevent committing tests that are run-order dependent,
or at least shake them out eventually in CI.
---
 toolsrc/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolsrc/CMakeLists.txt b/toolsrc/CMakeLists.txt
index 7dd333e30cb30f..c08e71fb066044 100644
--- a/toolsrc/CMakeLists.txt
+++ b/toolsrc/CMakeLists.txt
@@ -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)