From a99d8f1209aeef124cfdb64c51a8554684944c6f Mon Sep 17 00:00:00 2001 From: slozier Date: Thu, 31 Oct 2019 16:13:00 -0400 Subject: [PATCH] Run PROCESS isolated tests in 32-bit (#683) --- Build/steps.yml | 2 +- Src/IronPythonTest/Cases/CaseExecuter.cs | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Build/steps.yml b/Build/steps.yml index 9e6bb0214..f95bea44c 100644 --- a/Build/steps.yml +++ b/Build/steps.yml @@ -86,7 +86,7 @@ steps: # 32-bit tests on Windows only - ${{ if eq(parameters.os, 'Windows') }}: - - powershell: ./make.ps1 -platform x86 test-all + - powershell: ./make.ps1 -frameworks net45 -platform x86 test-all displayName: Test 32-bit - task: PublishTestResults@2 diff --git a/Src/IronPythonTest/Cases/CaseExecuter.cs b/Src/IronPythonTest/Cases/CaseExecuter.cs index 9edfceefd..7ce7e9a9f 100644 --- a/Src/IronPythonTest/Cases/CaseExecuter.cs +++ b/Src/IronPythonTest/Cases/CaseExecuter.cs @@ -39,11 +39,14 @@ private static string Executable { if (File.Exists(runner)) return runner; } #else + if (Environment.Is64BitOperatingSystem && IntPtr.Size == 4) { + runner = Path.Combine(folder, "ipy32.exe"); + if (File.Exists(runner)) return runner; + } runner = Path.Combine(folder, "ipy.exe"); if (File.Exists(runner)) return runner; #endif throw new FileNotFoundException(); - } }