From a0667a122bd2e4ac9fd01f3c554a43b040e8d9e0 Mon Sep 17 00:00:00 2001
From: Freddie Akeroyd <freddie.akeroyd@stfc.ac.uk>
Date: Mon, 17 Feb 2020 13:29:38 +0000
Subject: [PATCH] Excluded x64 tests now need to be excluded on x86 too

---
 src/libCom/test/epicsCalcTest.cpp |  4 ++--
 src/libCom/test/epicsMathTest.c   | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/libCom/test/epicsCalcTest.cpp b/src/libCom/test/epicsCalcTest.cpp
index 5f7d68826..ee2108ffb 100644
--- a/src/libCom/test/epicsCalcTest.cpp
+++ b/src/libCom/test/epicsCalcTest.cpp
@@ -612,14 +612,14 @@ MAIN(epicsCalcTest)
     testExpr(0.0 + NaN);
     testExpr(Inf + 0.0);
     testExpr(Inf + Inf);
-#if defined(_WIN64) && defined(_MSC_VER)
+#if defined(_WIN32) && defined(_MSC_VER)
     testCalc("Inf + -Inf", NaN);
 #else
     testExpr(Inf + -Inf);
 #endif
     testExpr(Inf + NaN);
     testExpr(-Inf + 0.0);
-#if defined(_WIN64) && defined(_MSC_VER)
+#if defined(_WIN32) && defined(_MSC_VER)
     testCalc("-Inf + Inf", NaN);
 #else
     testExpr(-Inf + Inf);
diff --git a/src/libCom/test/epicsMathTest.c b/src/libCom/test/epicsMathTest.c
index 8ea763cf0..ffb2426fd 100644
--- a/src/libCom/test/epicsMathTest.c
+++ b/src/libCom/test/epicsMathTest.c
@@ -32,23 +32,23 @@ MAIN(epicsMathTest)
     testOk1(epicsINF > 0.0);
     testOk1(epicsINF - epicsINF != 0.0);
 
-#if defined(_WIN64) && defined(_MSC_VER)
-    testTodoBegin("Known failure on windows-x64");
+#if defined(_WIN32) && defined(_MSC_VER)
+    testTodoBegin("Known failure on windows-x64 and win32-x86");
 #endif
     testOk1(epicsINF + -epicsINF != 0.0);
     testOk1(-epicsINF + epicsINF != 0.0);
-#if defined(_WIN64) && defined(_MSC_VER)
+#if defined(_WIN32) && defined(_MSC_VER)
     testTodoEnd();
 #endif
 
     testOk1(isnan(epicsINF - epicsINF));
 
-#if defined(_WIN64) && defined(_MSC_VER)
-    testTodoBegin("Known failure on windows-x64");
+#if defined(_WIN32) && defined(_MSC_VER)
+    testTodoBegin("Known failure on windows-x64  and win32-x86");
 #endif
     testOk1(isnan(epicsINF + -epicsINF));
     testOk1(isnan(-epicsINF + epicsINF));
-#if defined(_WIN64) && defined(_MSC_VER)
+#if defined(_WIN32) && defined(_MSC_VER)
     testTodoEnd();
 #endif
     
@@ -62,12 +62,12 @@ MAIN(epicsMathTest)
     testOk1(!(epicsNAN > epicsNAN));
     testOk1(isnan(epicsNAN - epicsNAN));
 
-#if defined(_WIN64) && defined(_MSC_VER)
-    testTodoBegin("Known failure on windows-x64");
+#if defined(_WIN32) && defined(_MSC_VER)
+    testTodoBegin("Known failure on windows-x64 and win32-x86");
 #endif
     testOk1(isnan(epicsNAN + -epicsNAN));
     testOk1(isnan(-epicsNAN + epicsNAN));
-#if defined(_WIN64) && defined(_MSC_VER)
+#if defined(_WIN32) && defined(_MSC_VER)
     testTodoEnd();
 #endif