diff options
author | Jiyoung Yun <jy910.yun@samsung.com> | 2017-02-10 20:35:12 +0900 |
---|---|---|
committer | Jiyoung Yun <jy910.yun@samsung.com> | 2017-02-10 20:35:12 +0900 |
commit | 4b11dc566a5bbfa1378d6266525c281b028abcc8 (patch) | |
tree | b48831a898906734f8884d08b6e18f1144ee2b82 /tests/src/Common/Coreclr.TestWrapper | |
parent | db20f3f1bb8595633a7e16c8900fd401a453a6b5 (diff) | |
download | coreclr-4b11dc566a5bbfa1378d6266525c281b028abcc8.tar.gz coreclr-4b11dc566a5bbfa1378d6266525c281b028abcc8.tar.bz2 coreclr-4b11dc566a5bbfa1378d6266525c281b028abcc8.zip |
Imported Upstream version 1.0.0.9910upstream/1.0.0.9910
Diffstat (limited to 'tests/src/Common/Coreclr.TestWrapper')
-rw-r--r-- | tests/src/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/tests/src/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs b/tests/src/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs index dbdfc0ef94..ddb905087b 100644 --- a/tests/src/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs +++ b/tests/src/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs @@ -35,6 +35,10 @@ namespace CoreclrTestLib string gcstressVar = Environment.GetEnvironmentVariable(GC_STRESS_LEVEL); + // Check if we are running in Windows + string operatingSystem = System.Environment.GetEnvironmentVariable("OS"); + bool runningInWindows = (operatingSystem != null && operatingSystem.StartsWith("Windows")); + var outputStream = new FileStream(outputFile, FileMode.Create); var errorStream = new FileStream(errorFile, FileMode.Create); @@ -49,7 +53,18 @@ namespace CoreclrTestLib process.StartInfo.EnvironmentVariables["COMPlus_GCStress"] = gcstressVar; } - process.StartInfo.FileName = executable; + // Windows can run the executable implicitly + if (runningInWindows) + { + process.StartInfo.FileName = executable; + } + // Non-windows needs to be told explicitly to run through /bin/bash shell + else + { + process.StartInfo.FileName = "/bin/bash"; + process.StartInfo.Arguments = executable; + } + process.StartInfo.UseShellExecute = false; process.StartInfo.RedirectStandardOutput = true; process.StartInfo.RedirectStandardError = true; |