Fixup

Author: dg0yt

scripts/azure-pipelines/azure-pipelines.yml

@@ -9,7 +9,7 @@ parameters:
   - name: tripletPattern
     displayName: 'Enable triplets which contain this substring'
     type: string
-    default: '^x64-windows-static'
+    default: '-'
 
 jobs:
 - template: windows/azure-pipelines.yml

scripts/test_ports/vcpkg-ci-mimalloc/portfile.cmake

@@ -10,8 +10,6 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         build-type.diff
-        vcpkg-tests.diff
-trace.diff
 )
 # Ensure that the test uses the installed mimalloc only
 file(REMOVE_RECURSE
@@ -23,8 +21,8 @@ file(REMOVE_RECURSE
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}/test"
     OPTIONS
+        "-DCMAKE_PROJECT_INCLUDE=${CURRENT_PORT_DIR}/vcpkg-tests.cmake"
         "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
-        "-DVCPKG_TESTS=${CURRENT_PORT_DIR}/vcpkg-tests.cmake"
 )
 
 set(ENV{MIMALLOC_VERBOSE} 1)
@@ -33,7 +31,9 @@ set(ENV{MIMALLOC_DISABLE_REDIRECT} 1)
 
 vcpkg_cmake_install(ADD_BIN_TO_PATH)
 
-vcpkg_copy_tools(TOOL_NAMES pkgconfig-override-cxx AUTO_CLEAN)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" OR NOT VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_copy_tools(TOOL_NAMES pkgconfig-override-cxx AUTO_CLEAN)
+endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
 

scripts/test_ports/vcpkg-ci-mimalloc/trace.diff

@@ -1,3 +1,5 @@
+macro(deferred_tests)
+
 find_package(PkgConfig REQUIRED)
 
 # Legacy variables
@@ -50,4 +52,10 @@ endif()
 
 if(TARGET pkgconfig-override-cxx)
     install(TARGETS pkgconfig-override-cxx)
-endif()
+else()
+    install(CODE [[ # placeholder # ]])
+endif()
+
+endmacro()
+
+cmake_language(DEFER CALL deferred_tests)

scripts/test_ports/vcpkg-ci-mimalloc/vcpkg-tests.cmake

@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "5fc45ab78a5140f9220639f7471d8ea394a13d9d",
+      "git-tree": "fb9693583cca76adeb691b9d6e0ab8f5a5f9982a",
       "version": "2.2.3",
       "port-version": 0
     },