Merge branch 'master' into external_file_abi

1 files changed, 52 insertions, 26 deletions

diff --git a/toolsrc/include/vcpkg-test/util.h b/toolsrc/include/vcpkg-test/util.h
index fa650abc8..8a458a3e5 100644
--- a/toolsrc/include/vcpkg-test/util.h
+++ b/toolsrc/include/vcpkg-test/util.h
@@ -1,42 +1,68 @@
+#include <vcpkg-test/catch.h>
+#include <vcpkg/pragmas.h>
+
 #include <vcpkg/base/files.h>
 #include <vcpkg/statusparagraph.h>
 
 #include <memory>
 
-namespace vcpkg::Test {
+#define CHECK_EC(ec)                                                                                                   \
+    do                                                                                                                 \
+    {                                                                                                                  \
+        if (ec)                                                                                                        \
+        {                                                                                                              \
+            FAIL(ec.message());                                                                                        \
+        }                                                                                                              \
+    } while (0)
 
-std::unique_ptr<vcpkg::StatusParagraph> make_status_pgh(const char* name,
-                                                        const char* depends = "",
-                                                        const char* default_features = "",
-                                                        const char* triplet = "x86-windows");
+namespace vcpkg::Test
+{
+    std::unique_ptr<vcpkg::StatusParagraph> make_status_pgh(const char* name,
+                                                            const char* depends = "",
+                                                            const char* default_features = "",
+                                                            const char* triplet = "x86-windows");
 
-std::unique_ptr<vcpkg::StatusParagraph> make_status_feature_pgh(const char* name,
-                                                                const char* feature,
-                                                                const char* depends = "",
-                                                                const char* triplet = "x86-windows");
+    std::unique_ptr<vcpkg::StatusParagraph> make_status_feature_pgh(const char* name,
+                                                                    const char* feature,
+                                                                    const char* depends = "",
+                                                                    const char* triplet = "x86-windows");
 
-vcpkg::PackageSpec unsafe_pspec(std::string name, vcpkg::Triplet t = vcpkg::Triplet::X86_WINDOWS);
+    vcpkg::PackageSpec unsafe_pspec(std::string name, vcpkg::Triplet t = vcpkg::Triplet::X86_WINDOWS);
 
-template<class T, class S>
-T&& unwrap(vcpkg::ExpectedT<T, S>&& p)
-{
-    REQUIRE(p.has_value());
-    return std::move(*p.get());
-}
+    template<class T, class S>
+    T&& unwrap(vcpkg::ExpectedT<T, S>&& p)
+    {
+        REQUIRE(p.has_value());
+        return std::move(*p.get());
+    }
 
-template<class T>
-T&& unwrap(vcpkg::Optional<T>&& opt)
-{
-    REQUIRE(opt.has_value());
-    return std::move(*opt.get());
-}
+    template<class T>
+    T&& unwrap(vcpkg::Optional<T>&& opt)
+    {
+        REQUIRE(opt.has_value());
+        return std::move(*opt.get());
+    }
+
+    struct AllowSymlinks
+    {
+        enum Tag : bool
+        {
+            No = false,
+            Yes = true,
+        } tag;
+
+        constexpr AllowSymlinks(Tag tag) noexcept : tag(tag) {}
+
+        constexpr explicit AllowSymlinks(bool b) noexcept : tag(b ? Yes : No) {}
 
-extern const bool SYMLINKS_ALLOWED;
+        constexpr operator bool() const noexcept { return tag == Yes; }
+    };
 
-extern const fs::path TEMPORARY_DIRECTORY;
+    AllowSymlinks can_create_symlinks() noexcept;
 
-void create_symlink(const fs::path& file, const fs::path& target, std::error_code& ec);
+    const fs::path& base_temporary_directory() noexcept;
 
-void create_directory_symlink(const fs::path& file, const fs::path& target, std::error_code& ec);
+    void create_symlink(const fs::path& file, const fs::path& target, std::error_code& ec);
 
+    void create_directory_symlink(const fs::path& file, const fs::path& target, std::error_code& ec);
 }