From cb19f1ba008657105da3d5c7156ee002761c1d3c Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 26 Nov 2024 10:47:45 -0500
Subject: [PATCH] Re-enable running exception state tests on Windows

but don't let exception state test program failure kill the job, or the other
platform.
---
 .github/workflows/build.yaml |  3 +--
 build-cmd.sh                 | 19 +++----------------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8822d0585f..a243497467 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -8,8 +8,7 @@ jobs:
   build:
     strategy:
       matrix:
-##      os: [windows-large, ubuntu-22.04]
-        os: [ubuntu-22.04]
+        os: [windows-large, ubuntu-22.04]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: secondlife/action-autobuild@v5
diff --git a/build-cmd.sh b/build-cmd.sh
index cc743c7474..78f81c62cd 100755
--- a/build-cmd.sh
+++ b/build-cmd.sh
@@ -55,17 +55,7 @@ apply_patch()
 }
 
 apply_patch "../patches/libs/config/0001-Define-BOOST_ALL_NO_LIB.patch" "libs/config"
-if [[ $? -ne 0 ]]
-then
-    nl -b a libs/config/include/boost/config/user.hpp
-fi
 apply_patch "../patches/libs/fiber/0001-DRTVWR-476-Use-WIN32_LEAN_AND_MEAN-for-each-include-.patch" "libs/fiber"
-if [[ $? -ne 0 ]]
-then
-    nl -b a libs/fiber/include/boost/fiber/detail/cpu_relax.hpp
-    echo "----"
-    nl -b a libs/fiber/include/boost/fiber/detail/futex.hpp
-fi
 
 if [[ "$OSTYPE" == "cygwin" || "$OSTYPE" == "msys" ]] ; then
     autobuild="$(cygpath -u $AUTOBUILD)"
@@ -351,7 +341,8 @@ fi # =========================================================================
             echo "${compile[*]}"
             if "${compile[@]}"
             then
-                "$testx"
+                # don't fail the whole job if the test blows up
+                "$testx" || true
                 rm "$testo" "$testx"
             else
                 echo "libraries in ${stage_release}:"
@@ -468,10 +459,6 @@ fi # =========================================================================
     linux*)
         # patch is specific to libstdc++
         apply_patch "../patches/libs/context/0001-switch-exception-state.patch" "libs/context"
-        if [[ $? -ne 0 ]]
-        then
-            nl -b a libs/context/include/boost/context/fiber_fcontext.hpp
-        fi
 
         # Force static linkage to libz by moving .sos out of the way
         trap restore_sos EXIT
@@ -505,7 +492,7 @@ fi # =========================================================================
             sep "$btest"
             if c++ -I. -o "$testo" "$test" "${stage_release}"/*
             then
-                "$testo"
+                "$testo" || true
                 rm "$testo"
             fi
         done