From 8589037d7345f17806dccc39048f4913ae2ba341 Mon Sep 17 00:00:00 2001
From: toge <toge.mail@gmail.com>
Date: Thu, 13 Mar 2025 02:41:17 +0900
Subject: [PATCH] [cpputest] update to 4.0 (#44317)

---
 ports/cpputest/fix-arm-build-error.patch | 20 --------------------
 ports/cpputest/portfile.cmake            | 10 ++++++----
 ports/cpputest/vcpkg.json                |  3 +--
 versions/baseline.json                   |  4 ++--
 versions/c-/cpputest.json                |  5 +++++
 5 files changed, 14 insertions(+), 28 deletions(-)
 delete mode 100644 ports/cpputest/fix-arm-build-error.patch

diff --git a/ports/cpputest/fix-arm-build-error.patch b/ports/cpputest/fix-arm-build-error.patch
deleted file mode 100644
index 5b017cb632..0000000000
--- a/ports/cpputest/fix-arm-build-error.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/tests/CppUTest/CMakeLists.txt b/tests/CppUTest/CMakeLists.txt
-index 7df07c1..d7317aa 100644
---- a/tests/CppUTest/CMakeLists.txt
-+++ b/tests/CppUTest/CMakeLists.txt
-@@ -56,4 +56,4 @@ add_executable(CppUTestTests ${CppUTestTests_src})
- cpputest_normalize_test_output_location(CppUTestTests)
- target_link_libraries(CppUTestTests CppUTest ${THREAD_LIB})
- 
--cpputest_buildtime_discover_tests(CppUTestTests)
-+#cpputest_buildtime_discover_tests(CppUTestTests)
-diff --git a/tests/CppUTestExt/CMakeLists.txt b/tests/CppUTestExt/CMakeLists.txt
-index b83ceb2..2abf274 100644
---- a/tests/CppUTestExt/CMakeLists.txt
-+++ b/tests/CppUTestExt/CMakeLists.txt
-@@ -37,4 +37,4 @@ endif (MINGW)
- add_executable(CppUTestExtTests ${CppUTestExtTests_src})
- cpputest_normalize_test_output_location(CppUTestExtTests)
- target_link_libraries(CppUTestExtTests CppUTest CppUTestExt ${THREAD_LIB} ${CPPUNIT_EXTERNAL_LIBRARIES})
--cpputest_buildtime_discover_tests(CppUTestExtTests)
-+#cpputest_buildtime_discover_tests(CppUTestExtTests)
diff --git a/ports/cpputest/portfile.cmake b/ports/cpputest/portfile.cmake
index 2643742f83..946698a5df 100644
--- a/ports/cpputest/portfile.cmake
+++ b/ports/cpputest/portfile.cmake
@@ -3,15 +3,17 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO cpputest/cpputest
-    REF 4699da9942a1bdcc33e2a8c8a48e863b0f18188e
-    SHA512 6f588691f1b4092b3be8167ab09f3a4a64c34715ac9397210724121d161024a43b12a88198b02b0cc8da7d72406670daaf375bb64cc4cf92c8bd2479e7a881bc
+    REF "v${VERSION}"
+    SHA512 5f7d6f9e34a462b35a0161a7486fd56074f5b07f92d029a3c57741c72df7bbc6ea4f98b1e57e9c500ad6d57c303d222afe523d59ec943f4461f67ce5be74dd77
     HEAD_REF master
-    PATCHES
-        fix-arm-build-error.patch
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DTESTS=OFF
+        -DTESTS_DETALED=OFF
+        -DTESTS_BUILD_DISCOVER=OFF
 )
 
 vcpkg_cmake_install()
diff --git a/ports/cpputest/vcpkg.json b/ports/cpputest/vcpkg.json
index ca41ae1f99..318c0a6156 100644
--- a/ports/cpputest/vcpkg.json
+++ b/ports/cpputest/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "cpputest",
-  "version": "2019-9-16",
-  "port-version": 3,
+  "version": "4.0",
   "description": "CppUTest unit testing and mocking framework for C/C++.",
   "homepage": "https://github.com/cpputest/cpputest",
   "license": "BSD-3-Clause",
diff --git a/versions/baseline.json b/versions/baseline.json
index 6a1d9b483b..ba28de9f9e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2013,8 +2013,8 @@
       "port-version": 4
     },
     "cpputest": {
-      "baseline": "2019-9-16",
-      "port-version": 3
+      "baseline": "4.0",
+      "port-version": 0
     },
     "cppwinrt": {
       "baseline": "2.0.240405.15",
diff --git a/versions/c-/cpputest.json b/versions/c-/cpputest.json
index dcc5957acc..2119a577f3 100644
--- a/versions/c-/cpputest.json
+++ b/versions/c-/cpputest.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a9756663709077665befaa7b71f9278f4613ef49",
+      "version": "4.0",
+      "port-version": 0
+    },
     {
       "git-tree": "9db5c5203e4af2efa89f513a14314e8bde14f24a",
       "version": "2019-9-16",