From 673e5fa27290520105d9aa423526ddb447da988e Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Tue, 16 Jun 2020 01:25:16 -0700
Subject: [PATCH 1/2] [evpp] Fix build error on OSX

---
 ports/evpp/CONTROL             |  2 +-
 ports/evpp/fix-osx-build.patch | 45 ++++++++++++++++++++++++++++++++++
 ports/evpp/portfile.cmake      |  7 +++---
 scripts/ci.baseline.txt        |  1 -
 4 files changed, 50 insertions(+), 5 deletions(-)
 create mode 100644 ports/evpp/fix-osx-build.patch

diff --git a/ports/evpp/CONTROL b/ports/evpp/CONTROL
index 5f367929a188c1..68244157bf24e1 100644
--- a/ports/evpp/CONTROL
+++ b/ports/evpp/CONTROL
@@ -1,5 +1,5 @@
 Source: evpp
-Version: 0.7.0-2
+Version: 0.7.0-3
 Homepage: https://github.com/Qihoo360/evpp
 Description: A modern C++ network library based on libevent for developing high performance network services in TCP/UDP/HTTP protocols.
 Build-Depends: glog, libevent (windows), libevent[openssl] (!windows), rapidjson, concurrentqueue (!windows), boost-lockfree (!windows)
\ No newline at end of file
diff --git a/ports/evpp/fix-osx-build.patch b/ports/evpp/fix-osx-build.patch
new file mode 100644
index 00000000000000..47c758fdeee635
--- /dev/null
+++ b/ports/evpp/fix-osx-build.patch
@@ -0,0 +1,45 @@
+diff --git a/evpp/server_status.h b/evpp/server_status.h
+index 3a83725..f28f833 100644
+--- a/evpp/server_status.h
++++ b/evpp/server_status.h
+@@ -25,7 +25,7 @@ public:
+     };
+ 
+     std::string StatusToString() const {
+-        H_CASE_STRING_BIGIN(status_);
++        H_CASE_STRING_BIGIN(+status_);
+         H_CASE_STRING(kNull);
+         H_CASE_STRING(kInitialized);
+         H_CASE_STRING(kRunning);
+diff --git a/evpp/sockets.cc b/evpp/sockets.cc
+index 333c05c..c547d88 100644
+--- a/evpp/sockets.cc
++++ b/evpp/sockets.cc
+@@ -22,6 +22,14 @@ std::string strerror(int e) {
+     }
+ 
+     return empty_string;
++#elif defined(__APPLE__)
++    char buf[2048] = {};
++    strerror_r(e, buf, sizeof(buf) - 1);
++    const char* s = buf;
++    if (s) {
++        return std::string(s);
++    }
++    return std::string();
+ #else
+     char buf[2048] = {};
+     const char* s = strerror_r(e, buf, sizeof(buf) - 1);
+diff --git a/evpp/tcp_conn.cc b/evpp/tcp_conn.cc
+index b7678d0..527b2b9 100644
+--- a/evpp/tcp_conn.cc
++++ b/evpp/tcp_conn.cc
+@@ -309,7 +309,7 @@ void TCPConn::SetTCPNoDelay(bool on) {
+ }
+ 
+ std::string TCPConn::StatusToString() const {
+-    H_CASE_STRING_BIGIN(status_);
++    H_CASE_STRING_BIGIN(+status_);
+     H_CASE_STRING(kDisconnected);
+     H_CASE_STRING(kConnecting);
+     H_CASE_STRING(kConnected);
diff --git a/ports/evpp/portfile.cmake b/ports/evpp/portfile.cmake
index ed75772de20236..b3edaf3aadf9cc 100644
--- a/ports/evpp/portfile.cmake
+++ b/ports/evpp/portfile.cmake
@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
 set(EVPP_VERSION 0.7.0)
 
 vcpkg_from_github(
@@ -11,13 +9,16 @@ vcpkg_from_github(
     PATCHES
         fix-rapidjson-1-1.patch
         fix-linux-build.patch
+        fix-osx-build.patch
 )
+
 file(REMOVE_RECURSE ${SOURCE_PATH}/3rdparty/rapidjson ${SOURCE_PATH}/3rdparty/concurrentqueue)
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS -DEVPP_VCPKG_BUILD=ON
+    OPTIONS
+        -DEVPP_VCPKG_BUILD=ON
 )
 
 vcpkg_install_cmake()
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index edc4e9b48c81fb..e7286ce818e039 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -417,7 +417,6 @@ epsilon:arm-uwp=fail
 epsilon:x64-linux=fail
 epsilon:x64-osx=fail
 epsilon:x64-uwp=fail
-evpp:x64-osx=fail
 expat:arm-uwp=fail
 expat:x64-uwp=fail
 faad2:x64-linux=fail

From 49630762c1e14a3d4fa7905f55a349bfa970d899 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Fri, 3 Jul 2020 00:37:33 -0700
Subject: [PATCH 2/2] update baseline

---
 scripts/ci.baseline.txt | 166 ++++++++++++----------------------------
 1 file changed, 49 insertions(+), 117 deletions(-)

diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 24986373eabc7c..4a1de9526668e5 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -13,9 +13,6 @@
 ##          This is added to ports that may be flaky or conflict with other
 ##          ports.  Please comment for why a port is skipped so it can be
 ##          removed when the issue is resolved.
-##   ignore - attempt to build the port, but do not fail the CI test if the
-##          port does not build.  Any ignored build failures will be reported
-##          in the test summary.
 ##
 ##
 ## CI tested triplets:
@@ -38,7 +35,7 @@
 3fd:x64-osx=fail
 3fd:x64-windows=fail
 3fd:x64-windows-static=fail
-3fd:x86-windows=ignore
+3fd:x86-windows=fail
 7zip:arm64-windows=fail
 7zip:arm-uwp=fail
 7zip:x64-linux=fail
@@ -64,9 +61,6 @@ angelscript:arm64-windows=fail
 angelscript:arm-uwp=fail
 antlr4:arm-uwp=fail
 antlr4:x64-uwp=fail
-anyrpc:arm-uwp=ignore
-anyrpc:x86-windows=ignore
-anyrpc:x64-windows-static=ignore
 apr:arm-uwp=fail
 apr:x64-uwp=fail
 # Cross compiling CI machine cannot run gen_test_char to generate apr_escape_test_char.h
@@ -107,10 +101,8 @@ aws-lambda-cpp:x64-windows=fail
 aws-lambda-cpp:x64-windows-static=fail
 aws-lambda-cpp:x86-windows=fail
 aws-lambda-cpp:x64-osx=fail
-aws-sdk-cpp:x64-linux=ignore
 azure-c-shared-utility:arm-uwp=fail
 azure-c-shared-utility:x64-uwp=fail
-basisu:x64-linux=ignore
 bde:arm64-windows=fail
 bde:arm-uwp=fail
 bde:x64-uwp=fail
@@ -151,7 +143,6 @@ boost-fiber:arm-uwp=fail
 boost-fiber:arm64-windows=fail
 boost-fiber:x64-osx=fail
 boost-fiber:x64-uwp=fail
-boost-fiber:x64-linux=ignore
 boost-filesystem:arm-uwp=fail
 boost-filesystem:x64-uwp=fail
 boost-iostreams:arm-uwp=fail
@@ -175,11 +166,9 @@ breakpad:arm64-windows=fail
 bullet3:arm64-windows=fail
 bullet3:arm-uwp=fail
 bullet3:x64-uwp=fail
-butteraugli:x64-linux=ignore
 caf:arm-uwp=fail
 caf:arm64-windows=fail
 caf:x64-uwp=fail
-caf:x64-linux=ignore
 caffe2:x86-windows=fail
 caffe2:arm64-windows=fail
 cairomm:x64-linux=fail
@@ -238,7 +227,6 @@ civetweb:arm-uwp            = skip
 civetweb:x64-uwp            = skip
 clapack:x64-uwp=fail
 clblas:arm64-windows=fail
-clblast:x64-osx=ignore
 clblast:x64-linux=fail
 clblast:x64-windows-static=fail
 clockutils:x64-linux=fail
@@ -270,15 +258,11 @@ cppcms:x64-osx=fail
 cppcms:x64-windows-static=fail
 cppfs:arm-uwp=fail
 cppfs:x64-uwp=fail
-cppgraphqlgen:arm-uwp=ignore
-cppgraphqlgen:x64-uwp=ignore
-cppkafka:x64-linux=ignore
 cppmicroservices:arm64-windows=fail
 cppmicroservices:arm-uwp=fail
 cppmicroservices:x64-uwp=fail
 cpp-netlib:arm-uwp=fail
 cpp-netlib:x64-uwp=fail
-cpp-netlib:x64-linux=ignore
 cpp-taskflow:x64-osx=fail
 cppcoro:x64-linux=fail
 cppcoro:arm-uwp=fail
@@ -288,8 +272,7 @@ cppunit:arm-uwp=fail
 cppunit:x64-linux=fail
 cppunit:x64-osx=fail
 cppunit:x64-uwp=fail
-cpr:x64-linux=ignore
-cpuinfo:arm64-windows=ignore
+cpuinfo:arm64-windows=fail
 crashpad:arm64-windows=fail
 crashpad:arm-uwp=fail
 crashpad:x64-linux=fail
@@ -344,10 +327,10 @@ dlfcn-win32:x64-linux=fail
 dlfcn-win32:x64-osx=fail
 dlfcn-win32:x64-uwp=fail
 dmlc:arm-uwp=fail
-dmlc:arm64-windows=ignore
+dmlc:arm64-windows=fail
 dmlc:x64-uwp=fail
-dmlc:x64-windows-static=ignore
-dmlc:x86-windows=ignore
+dmlc:x64-windows-static=fail
+dmlc:x86-windows=fail
 dpdk:arm-uwp=fail
 dpdk:arm64-windows=fail
 dpdk:x64-linux=fail
@@ -456,11 +439,11 @@ fmi4cpp:arm-uwp=fail
 fmi4cpp:x64-uwp=fail
 fmilib:arm64-windows=fail
 fmilib:arm-uwp=fail
-fmilib:x64-linux=ignore
+fmilib:x64-linux=fail
 fmilib:x64-uwp=fail
-fmilib:x64-windows=ignore
-fmilib:x64-windows-static=ignore
-fmilib:x86-windows=ignore
+fmilib:x64-windows=fail
+fmilib:x64-windows-static=fail
+fmilib:x86-windows=fail
 foonathan-memory:arm64-windows=fail
 foonathan-memory:arm-uwp=fail
 foonathan-memory:x64-uwp=fail
@@ -479,11 +462,11 @@ freetds:x64-osx=fail
 freetds:x64-uwp=fail
 freetype-gl:x64-uwp=fail
 freexl:arm-uwp=fail
-freexl:arm64-windows=ignore
+freexl:arm64-windows=fail
 freexl:x64-uwp=fail
-freexl:x86-windows=ignore
-freexl:x64-windows=ignore
-freexl:x64-windows-static=ignore
+freexl:x86-windows=fail
+freexl:x64-windows=fail
+freexl:x64-windows-static=fail
 fribidi:arm64-windows=fail
 fribidi:arm-uwp=fail
 fribidi:x64-linux=fail
@@ -507,7 +490,6 @@ gasol:arm-uwp=fail
 gasol:x64-uwp=fail
 gdcm:arm64-windows=fail
 gdcm:x64-linux               = skip
-geographiclib:x64-linux=ignore
 geos:arm-uwp=fail
 geos:x64-uwp=fail
 getopt:arm-uwp=fail
@@ -539,7 +521,6 @@ glfw3:x64-uwp=fail
 glib:x64-uwp=fail
 glib:x64-windows-static=fail
 glib:x64-osx=fail
-globjects:x64-linux=ignore
 gmmlib:arm64-windows=fail
 gmmlib:arm-uwp=fail
 gmmlib:x64-osx=fail
@@ -569,7 +550,6 @@ gsoap:x64-linux=fail
 gsoap:x64-osx=fail
 gsoap:x64-uwp=fail
 gtk:x64-linux=fail
-gtk:x86-windows=ignore
 guetzli:x64-osx=fail
 h3:arm64-windows=fail
 h3:arm-uwp=fail
@@ -597,7 +577,6 @@ hpx:x64-linux=fail
 hwloc:arm64-windows=fail
 hwloc:arm-uwp=fail
 hwloc:x64-uwp=fail
-hyperscan:x64-linux=ignore
 # hypre has a conflict with 'superlu' port
 hypre:x64-linux=skip
 hypre:x64-osx=skip
@@ -615,7 +594,6 @@ ignition-msgs5:arm64-windows=fail
 ignition-msgs5:arm-uwp=fail
 ignition-msgs5:x64-uwp=fail
 ignition-msgs5:x64-osx=skip
-imgui-sfml:x64-linux=ignore
 intel-ipsec:arm64-windows=fail
 intel-ipsec:arm-uwp=fail
 intel-ipsec:x64-osx=fail
@@ -648,7 +626,6 @@ isal:x86-windows=fail
 itk:x64-windows=fail
 itk:x64-windows-static=fail
 itk:x86-windows=fail
-ixwebsocket:x64-linux=ignore
 jack2:arm-uwp=fail
 jack2:x64-uwp=fail
 jaeger-client-cpp:arm64-windows=fail
@@ -738,10 +715,9 @@ libfabric:arm-uwp=fail
 libfabric:x64-linux=fail
 libfabric:x64-osx=fail
 libfabric:x64-uwp=fail
-libfabric:x64-windows=ignore
+libfabric:x64-windows=fail
 libfabric:x64-windows-static=fail
 libfreenect2:arm64-windows=fail
-libgd:x64-linux=ignore
 libgit2:arm-uwp=fail
 libgit2:x64-uwp=fail
 libgo:arm-uwp=fail
@@ -823,9 +799,6 @@ libmupdf:x64-osx=fail
 libmysql:x86-windows=fail
 libnice:x64-linux=fail
 libnice:x64-osx=fail
-libodb-boost:x64-linux=ignore
-libodb-pgsql:x64-linux=ignore
-libodb-pgsql:x64-windows=ignore
 libopenmpt:x64-linux=fail
 libopenmpt:x64-osx=fail
 libopusenc:arm-uwp=fail
@@ -875,7 +848,6 @@ libpq:x64-uwp=fail
 libqcow:arm-uwp=fail
 libqcow:x64-uwp=fail
 libqcow:x64-windows-static=fail
-librabbitmq:x64-linux=ignore
 libraqm:x64-windows-static=fail
 librdkafka:arm-uwp=fail
 librdkafka:x64-uwp=fail
@@ -973,7 +945,6 @@ libxslt:x64-osx=fail
 libxslt:x64-uwp=fail
 libyuv:arm-uwp=fail
 libyuv:x64-uwp=fail
-libzippp:x64-linux=ignore
 licensepp:arm-uwp=fail
 licensepp:x64-uwp=fail
 linenoise-ng:arm-uwp=fail
@@ -1021,7 +992,6 @@ marl:arm-uwp=fail
 marl:x64-uwp=fail
 mathgl:x64-osx=fail
 mathgl:x64-uwp=fail
-mathgl:x64-linux=ignore
 matio:x64-linux=fail
 matio:x64-osx=fail
 mbedtls:arm-uwp=fail
@@ -1059,7 +1029,7 @@ mhook:x64-osx=fail
 mhook:x64-uwp=fail
 milerius-sfml-imgui:x64-osx=fail
 milerius-sfml-imgui:x64-windows-static=fail
-milerius-sfml-imgui:x64-linux=ignore
+milerius-sfml-imgui:x64-linux=fail
 mimalloc:arm64-windows=fail
 mimalloc:arm-uwp=fail
 mimalloc:x64-uwp=fail
@@ -1115,13 +1085,13 @@ monkeys-audio:x64-uwp=fail
 monkeys-audio:x64-windows-static=fail
 moos-core:arm-uwp=fail
 moos-core:x64-uwp=fail
-moos-core:x64-windows=ignore
+moos-core:x64-windows=fail
 moos-core:x64-windows-static=fail
-moos-core:x86-windows=ignore
+moos-core:x86-windows=fail
 moos-essential:arm64-windows=fail
 moos-essential:x64-windows=fail
 moos-essential:x86-windows=fail
-moos-essential:x64-linux=ignore
+moos-essential:x64-linux=fail
 mozjpeg:arm64-windows      = skip
 mozjpeg:arm-uwp            = skip
 mozjpeg:x64-linux          = skip
@@ -1179,15 +1149,14 @@ nanorange:x64-windows=fail
 nanorange:x64-windows-static=fail
 nanorange:x86-windows=fail
 nanovg:arm-uwp=fail
-nanovg:arm64-windows=ignore
+nanovg:arm64-windows=fail
 nanovg:x64-uwp=fail
-nanovg:x64-linux=ignore
-nanovg:x64-windows=ignore
-nanovg:x64-windows-static=ignore
+nanovg:x64-linux=fail
+nanovg:x64-windows=fail
+nanovg:x64-windows-static=fail
 nanovg:x86-windows=skip
 nativefiledialog:arm-uwp=fail
 nativefiledialog:x64-uwp=fail
-netcdf-cxx4:x64-linux=ignore
 nethost:x64-uwp=fail
 nethost:arm-uwp=fail
 nettle:x64-windows-static=skip
@@ -1206,7 +1175,6 @@ nng:arm-uwp=fail
 nng:x64-uwp=fail
 nrf-ble-driver:arm-uwp=fail
 nrf-ble-driver:x64-uwp=fail
-nrf-ble-driver:x64-linux=ignore
 numactl:arm64-windows=fail
 numactl:arm-uwp=fail
 numactl:x64-osx=fail
@@ -1226,7 +1194,6 @@ octomap:x64-uwp=fail
 ode:arm64-windows=fail
 ode:arm-uwp=fail
 ode:x64-uwp=fail
-ode:x64-linux=ignore
 offscale-libetcd-cpp:arm64-windows=fail
 offscale-libetcd-cpp:arm-uwp=fail
 offscale-libetcd-cpp:x64-uwp=fail
@@ -1268,7 +1235,6 @@ opencensus-cpp:x86-windows=fail
 opencensus-cpp:x64-uwp=fail
 opencl:arm-uwp=fail
 opencl:x64-uwp=fail
-opencolorio:x64-linux=ignore
 opencsg:x64-uwp=fail
 opencv2:arm64-windows      = skip
 opencv2:arm-uwp            = skip
@@ -1293,9 +1259,8 @@ openexr:arm-uwp=fail
 openexr:x64-uwp=fail
 opengl:arm64-windows=fail
 opengl:arm-uwp=fail
-openimageio:x64-linux=ignore
-openmama:x64-windows=ignore
-openmama:x86-windows=ignore
+openmama:x64-windows=fail
+openmama:x86-windows=fail
 openmama:x64-linux=fail
 openmama:x64-osx=fail
 openmesh:arm64-windows=fail
@@ -1307,7 +1272,6 @@ openmpi:x64-uwp=fail
 openmpi:x64-windows=fail
 openmpi:x64-windows-static=fail
 openmpi:x86-windows=fail
-openmvg:x64-linux=ignore
 openmvs:x64-linux=fail
 openni2:x64-uwp=fail
 openni2:x64-windows-static=fail
@@ -1330,7 +1294,6 @@ openssl-windows:x64-osx=fail
 openssl-windows:x64-uwp=fail
 opentracing:arm-uwp=fail
 opentracing:x64-uwp=fail
-openvdb:x64-linux=ignore
 openvdb:x64-osx=fail
 #openvdb:x64-windows-static=fail # https://github.com/microsoft/vcpkg/pull/10816#issuecomment-613784827
 openvpn3:x64-osx=fail
@@ -1352,7 +1315,6 @@ optional-bare:x64-windows-static = skip
 optional-bare:x86-windows        = skip
 opusfile:arm-uwp=fail
 opusfile:x64-uwp=fail
-orc:x64-linux=ignore
 orocos-kdl:arm-uwp=fail
 orocos-kdl:x64-uwp=fail
 osg:x86-windows=skip
@@ -1361,11 +1323,6 @@ osgearth:x64-osx=fail
 osgearth:x64-linux=fail
 osgearth:x64-windows-static=fail
 osg-qt:x64-windows-static=fail
-otl:x64-windows=ignore
-otl:x64-windows-static=ignore
-otl:x64-uwp=ignore
-otl:x64-linux=ignore
-otl:x86-windows=ignore
 paho-mqtt:arm-uwp=fail
 paho-mqtt:x64-uwp=fail
 pangolin:x64-linux=fail
@@ -1373,8 +1330,6 @@ pangolin:x64-osx=fail
 pangolin:x64-uwp=fail
 pangolin:x64-windows-static=fail
 pangomm:x64-osx=fail
-pangomm:x64-windows=ignore
-pangomm:x86-windows=ignore
 pangomm:arm64-windows=fail
 parmetis:x64-linux=fail
 parmetis:x64-osx=fail
@@ -1413,7 +1368,6 @@ pixel:x64-uwp=fail
 pixel:x64-windows=fail
 pixel:x64-windows-static=fail
 pixel:x86-windows=fail
-pixel:x64-linux=ignore
 platform-folders:arm-uwp=fail
 platform-folders:x64-uwp=fail
 plib:arm-uwp=fail
@@ -1433,7 +1387,6 @@ pmdk:x64-windows-static=fail
 pmdk:x86-windows=fail
 pngwriter:arm-uwp=fail
 pngwriter:x64-uwp=fail
-pngwriter:x64-linux=ignore
 polyhook2:arm64-windows=fail
 polyhook2:arm-uwp=fail
 polyhook2:x64-linux=fail
@@ -1451,15 +1404,11 @@ portmidi:arm-uwp=fail
 portmidi:x64-linux=fail
 portmidi:x64-osx=fail
 portmidi:x64-uwp=fail
-ppconsul:x64-linux=ignore
 pqp:arm-uwp=fail
 pqp:x64-uwp=fail
 proj4:arm64-windows=fail
 proj4:arm-uwp=fail
 proj4:x64-uwp=fail
-protobuf:x64-uwp=ignore
-protobuf:arm64-windows=ignore
-protobuf:arm-uwp=ignore
 protobuf-c:x86-windows=fail
 protobuf-c:x64-windows=fail
 protobuf-c:x64-windows-static=fail
@@ -1487,9 +1436,8 @@ python3:x64-uwp=fail
 qca:x64-linux=fail
 qca:x64-osx=fail
 qca:x64-windows-static=fail
-qhull:arm-uwp=ignore
-qhull:x64-windows-static=ignore
-qhull:x64-uwp=ignore
+qhull:x64-uwp=fail
+qhull:arm-uwp=fail
 qpid-proton:arm-uwp=fail
 qpid-proton:x64-uwp=fail
 qpid-proton:x64-windows-static=fail
@@ -1524,13 +1472,13 @@ qt5-x11extras:x64-windows-static=fail
 # Broken by VS2019 16.6 and throws a ton of dialogs attempting to build
 # fixed by https://github.com/microsoft/vcpkg/pull/11596
 qt5-translations:x64-windows-static=skip
-quickfast:x64-linux=ignore
-quickfix:x64-linux=ignore
-quickfix:x64-windows=ignore
-quickfix:x64-windows-static=ignore
-quickfix:x86-windows=ignore
-quickfix:x64-uwp=fail
 quickfix:arm-uwp=fail
+quickfix:arm64-windows=fail
+quickfix:x64-linux=fail
+quickfix:x64-uwp=fail
+quickfix:x64-windows-static=fail
+quickfix:x64-windows=fail
+quickfix:x86-windows=fail
 quill:arm64-windows=fail
 quill:arm-uwp=fail
 quill:x64-uwp=fail
@@ -1542,9 +1490,8 @@ quirc:x64-uwp            = skip
 quirc:x64-windows        = skip
 quirc:x64-windows-static = skip
 quirc:x86-windows        = skip
-qwt:x64-osx=ignore
+qwt:x64-osx=fail
 rabit:x64-osx=fail
-rabit:x64-linux=ignore
 ragel:arm-uwp=fail
 ragel:x64-uwp=fail
 range-v3-vs2015:arm64-windows      = skip
@@ -1592,13 +1539,9 @@ rhash:arm-uwp=fail
 rhash:x64-uwp=fail
 rocksdb:arm-uwp=fail
 rocksdb:x64-uwp=fail
-rocksdb:x64-linux=ignore
 rpclib:arm64-windows=fail
 rpclib:arm-uwp=fail
 rpclib:x64-uwp=fail
-rpclib:x64-windows=ignore
-rpclib:x86-windows=ignore
-rpclib:x64-windows-static=ignore
 rtlsdr:x64-uwp=fail
 rtlsdr:arm64-windows=fail
 rtlsdr:arm-uwp=fail
@@ -1635,7 +1578,6 @@ scylla-wrapper:x64-windows-static=fail
 sdformat6:arm64-windows=fail
 sdformat6:arm-uwp=fail
 sdformat6:x64-uwp=fail
-sdformat6:x64-linux=ignore
 sdformat9:x64-linux=fail
 sdformat9:arm-uwp=fail
 sdformat9:x64-uwp=fail
@@ -1653,7 +1595,6 @@ seal:arm-uwp=fail
 seal:x64-uwp=fail
 secp256k1:x64-linux=fail
 secp256k1:x64-osx=fail
-selene:x64-linux=ignore
 sentencepiece:arm64-windows=fail
 sentencepiece:arm-uwp=fail
 sentencepiece:x64-uwp=fail
@@ -1662,7 +1603,6 @@ sentencepiece:x86-windows=fail
 septag-sx:arm64-windows=fail
 septag-sx:arm-uwp=fail
 septag-sx:x64-uwp=fail
-sfgui:x64-linux=ignore
 sfml:arm64-windows=fail
 shapelib:arm-uwp=fail
 shapelib:x64-uwp=fail
@@ -1707,13 +1647,11 @@ soqt:arm64-windows=fail
 soqt:arm-uwp=fail
 soqt:x64-uwp=fail
 soundtouch:arm-uwp=fail
-soundtouch:x64-linux=ignore
 soundtouch:x64-uwp=fail
 soundtouch:x64-windows-static=fail
 spaceland:arm64-windows=fail
 spaceland:arm-uwp=fail
 spaceland:x64-uwp=fail
-spaceland:x64-linux=ignore
 spdk:x64-linux=fail
 spdk-dpdk:arm64-windows=fail
 spdk-dpdk:arm-uwp=fail
@@ -1773,15 +1711,14 @@ superlu:x64-windows=skip
 systemc:arm64-windows=fail
 systemc:arm-uwp=fail
 systemc:x64-uwp=fail
-taglib:x64-linux=ignore
 tbb:arm64-windows=fail
 tbb:arm-uwp=fail
 tbb:x64-uwp=fail
-tcl:arm-uwp=ignore
-tcl:arm64-windows=ignore
-tcl:x64-uwp=ignore
-tcl:x64-linux=ignore
-tcl:x64-osx=ignore
+tcl:arm-uwp=fail
+tcl:arm64-windows=fail
+tcl:x64-uwp=fail
+tcl:x64-linux=fail
+tcl:x64-osx=fail
 teemo:x64-uwp=fail
 teemo:arm-uwp=fail
 teemo:arm64-windows=fail
@@ -1794,9 +1731,9 @@ tensorflow-cc:x64-osx=skip
 tensorflow-cc:x64-windows=fail
 tensorflow-cc:x64-windows-static=fail
 tensorflow-cc:x86-windows=fail
-tesseract:x64-windows=ignore
-tesseract:x64-windows-static=ignore
-tesseract:x86-windows=ignore
+tesseract:x64-windows=fail
+tesseract:x64-windows-static=fail
+tesseract:x86-windows=fail
 tesseract:arm64-windows=fail
 tfhe:x86-windows=fail
 tfhe:x64-windows=fail
@@ -1820,7 +1757,6 @@ tinyexif:arm-uwp=fail
 tinyexif:x64-uwp=fail
 tinyfiledialogs:arm-uwp=fail
 tinyfiledialogs:x64-uwp=fail
-tinynpy:x64-linux=ignore
 tiny-process-library:arm-uwp=fail
 tiny-process-library:x64-uwp=fail
 tinyutf8:arm64-windows=fail
@@ -1908,15 +1844,13 @@ vxl:x64-windows        = skip
 vxl:x64-windows-static = skip
 vxl:x86-windows        = skip
 wampcc:arm64-windows=fail
-wampcc:x64-linux=ignore
-wangle:x64-linux=ignore
 wavpack:arm64-windows=fail
 wavpack:x64-linux=fail
 wavpack:x64-osx=fail
-wepoll:arm-uwp=ignore
-wepoll:x64-uwp=ignore
-wepoll:x64-linux=ignore
-wepoll:x64-osx=ignore
+wepoll:arm-uwp=fail
+wepoll:x64-uwp=fail
+wepoll:x64-linux=fail
+wepoll:x64-osx=fail
 wildmidi:x64-osx=fail
 wincrypt:x64-linux=fail
 wincrypt:x64-osx=fail
@@ -1945,11 +1879,11 @@ wxchartdir:x64-osx=fail
 wxwidgets:x64-linux=fail
 x264:arm64-windows=fail
 x264:arm-uwp=fail
-x264:x64-uwp=ignore
+x264:x64-uwp=fail
 x264:x64-osx=fail
-x264:x86-windows=ignore
-x264:x64-windows=ignore
-x264:x64-windows-static=ignore
+x264:x86-windows=fail
+x264:x64-windows=fail
+x264:x64-windows-static=fail
 x265:arm64-windows=fail
 x265:arm-uwp=fail
 x265:x64-uwp=fail
@@ -1960,7 +1894,6 @@ xbyak:arm-uwp=fail
 xbyak:x64-uwp=fail
 xerces-c:arm-uwp=fail
 xerces-c:x64-uwp=fail
-xeus:x64-linux=ignore
 xmlsec:arm-uwp=fail
 xmlsec:x64-uwp=fail
 # The xmsh upstream repository is gone, if we find no replacement before
@@ -1973,7 +1906,6 @@ xmsh:x64-uwp=skip
 xmsh:x64-windows-static=skip
 xmsh:x64-windows=skip
 xmsh:x86-windows=skip
-xtensor-io:x64-uwp=ignore
 x-plane:arm64-windows=fail
 x-plane:arm-uwp=fail
 x-plane:x64-linux=fail