Clean up the CoreCLR test wrappers.

- Various simplifications to the Xunit wrapper and the test helper
- Allow the specification of the test env script and the CORE_ROOT
  directory at the command line on Windows.

5 files changed, 129 insertions, 150 deletions

diff --git a/tests/runtest.proj b/tests/runtest.proj
index a667bb102f..413a627303 100644
--- a/tests/runtest.proj
+++ b/tests/runtest.proj
@@ -201,94 +201,89 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").
       <AllCMDExcludeFilter Include="@(CanonicalExcludeList)" Condition="'$(__Exclude)' != ''"/>
       <AllCMDs Include="@(AllCMDsPresent)" Exclude="@(AllCMDExcludeFilter)"/>
 
-      <AllCommamds Include="@(AllCMDs)" >
+      <AllCommands Include="@(AllCMDs)" >
+        <_FactName>$([System.String]::Copy('%(AllCMDs.FullPath)').Replace("$(_CMDDIR)",'').Replace(".","_").Replace("\","_").Replace("-","_"))</_FactName>
+        <_ClassName>$([System.String]::Copy('%(AllCMDs.FullPath)').Replace("$(_CMDDIR)",'').Replace("cmd","").Replace(".","_").Replace("\","_").Replace("-","_"))</_ClassName>
 
-        <_FactName>$([System.String]::Copy('%(AllCMDs.FullPath)').Replace("$(_CMDDIR)",'').Replace(".","_"))</_FactName>
         <_XunitFact >
           <![CDATA[
              
-public class $([System.String]::Copy('%(AllCMDs.FullPath)').Replace("$(_CMDDIR)",'').Replace("cmd","").Replace(".","_").Replace("\","_").Replace("-","_"))
-    {
-               static bool category_initlialized = false%3B
-               static bool runningInWindows = false%3B
-               static string reportbase%3B
-               static string TestBinaryBase%3B
-               static string core_root%3B
-               static void init()
-               {
-                   if (!category_initlialized)
-                   {
-                       reportbase = System.IO.Path.GetFullPath(System.Environment.GetEnvironmentVariable(%22XunitTestReportDirBase%22))%3B
-                       TestBinaryBase = System.IO.Path.GetFullPath(System.Environment.GetEnvironmentVariable(%22XunitTestBinBase%22))%3B
-                       core_root = System.IO.Path.GetFullPath(System.Environment.GetEnvironmentVariable(%22CORE_ROOT%22))%3B
-                       if (String.IsNullOrEmpty(reportbase)){
-                      
-                           throw new ArgumentException("Env variables XunitTestReportDirBase is not set") %3B
-                       }
-                           
-                       if (String.IsNullOrEmpty(TestBinaryBase)){
-                        
-                           throw new ArgumentException("Env variables XunitTestBinBase is not set")%3B
-                       }
-                       
-                       if (String.IsNullOrEmpty(core_root)){
-                        
-                           throw new ArgumentException("Env variables CORE_ROOT is not set")%3B
-                       }
-                       runningInWindows = System.Environment.GetEnvironmentVariable("OS").StartsWith("Windows")%3B
-
-                       
-                       category_initlialized = true%3B
-                   }
-               }
-    
-                [Fact]
-                public void $([System.String]::Copy('%(AllCMDs.FullPath)').Replace("$(_CMDDIR)",'').Replace(".","_").Replace("\","_").Replace("-","_"))()
+        public class %(AllCommands._ClassName)
+        {
+            static bool runningInWindows%3B
+            static string reportBase%3B
+            static string testBinaryBase%3B
+            static string coreRoot%3B
+
+            static %(AllCommands._ClassName)()
+            {
+                reportBase = System.IO.Path.GetFullPath(System.Environment.GetEnvironmentVariable(%22XunitTestReportDirBase%22))%3B
+                testBinaryBase = System.IO.Path.GetFullPath(System.Environment.GetEnvironmentVariable(%22XunitTestBinBase%22))%3B
+                coreRoot = System.IO.Path.GetFullPath(System.Environment.GetEnvironmentVariable(%22CORE_ROOT%22))%3B
+
+                if (String.IsNullOrEmpty(reportBase)) {
+                    throw new ArgumentException("Environment variable XunitTestReportDirBase is not set")%3B
+                }
+
+                if (String.IsNullOrEmpty(testBinaryBase)) {
+                    throw new ArgumentException("Environment variable XunitTestBinBase is not set")%3B
+                }
+
+                if (String.IsNullOrEmpty(coreRoot)) {
+                    throw new ArgumentException("Environment variable CORE_ROOT is not set")%3B
+                }
+
+                runningInWindows = System.Environment.GetEnvironmentVariable("OS").StartsWith("Windows")%3B
+            }
+
+            [Fact]
+            public void %(AllCommands._FactName)()
+            {
+                int ret = -100%3B
+                string outputFile = null%3B
+                string errorFile = null%3B
+                string testExecutable = null%3B
+                Exception infraEx = null%3B
+
+                try
                 {
-                    int ret = -100%3B
-                    string msg ="Test Infrastructure Failure :\n"%3B
-                    try
-                    {
-                      init()%3B
-                      CoreclrTestWrapperLib wrapper = new CoreclrTestWrapperLib()%3B
-                      string testsubfolder = @"\$(Category)\$([System.String]::Copy('%(AllCMDs.RelativeDir)').Replace("$(_CMDDIR)\",''))"%3B
-                      string outputfile = System.IO.Path.GetFullPath(reportbase + testsubfolder + @"%(AllCMDs.FileName).output.txt")%3B
-                      string errorfile = System.IO.Path.GetFullPath(reportbase + testsubfolder + @"%(AllCMDs.FileName).error.txt")%3B
-                      string test_cmd = System.IO.Path.GetFullPath(TestBinaryBase + @"\$(Category)\$([System.String]::Copy('%(AllCMDs.FullPath)').Replace("$(_CMDDIR)",''))")%3B
-
-                    
-                      if (!runningInWindows){
-                    
-                          test_cmd = test_cmd.Replace(".cmd", ".sh")%3B
-                      }
-                    
-                      System.IO.Directory.CreateDirectory(reportbase + testsubfolder)%3B
-                    
-                      ret = wrapper.RunTest(test_cmd, outputfile, errorfile)%3B
-                    
-                      string err_text = System.IO.File.ReadAllText(errorfile)%3B
-                      msg = err_text + 
-                            @"Raw Output          :"+ outputfile + "\n" +
-                            @"To Run the test     :Step 1. set Core_Root="+ core_root + "\n" +
-                             "                     Step 2. "+test_cmd + "\n"%3B
-                      
-                    
-                    }
-                    catch (Exception Ex)
-                    {
-                       msg = msg  + Ex.Message%3B
-                    }
-                    
+                  CoreclrTestWrapperLib wrapper = new CoreclrTestWrapperLib()%3B
+                  string testSubfolder = @"\$(Category)\$([System.String]::Copy('%(AllCMDs.RelativeDir)').Replace("$(_CMDDIR)\",''))"%3B
+                  outputFile = System.IO.Path.GetFullPath(reportBase + testSubfolder + @"%(AllCMDs.FileName).output.txt")%3B
+                  errorFile = System.IO.Path.GetFullPath(reportBase + testSubfolder + @"%(AllCMDs.FileName).error.txt")%3B
+                  testExecutable = System.IO.Path.GetFullPath(testBinaryBase + @"\$(Category)\$([System.String]::Copy('%(AllCMDs.FullPath)').Replace("$(_CMDDIR)",''))")%3B
+
+                  if (!runningInWindows) {
+                      testExecutable = testExecutable.Replace(".cmd", ".sh")%3B
+                  }
+
+                  System.IO.Directory.CreateDirectory(reportBase + testSubfolder)%3B
+
+                  ret = wrapper.RunTest(testExecutable, outputFile, errorFile)%3B
+                }
+                catch (Exception ex)
+                {
+                    infraEx = ex%3B
+                }
+
+                if (ret != CoreclrTestWrapperLib.EXIT_SUCCESS_CODE)
+                {
+                    string msg = infraEx != null ? "Test Infrastructure Failure: " + infraEx.Message
+                                                 : System.IO.File.ReadAllText(errorFile) + "\n\n" +
+                                                   "Raw output:      " + outputFile + "\n" +
+                                                   "To run the test:\n" +
+                                                   "> set CORE_ROOT=" + coreRoot + "\n" +
+                                                   "> " + testExecutable + "\n"%3B
+
                     Assert.True(ret == CoreclrTestWrapperLib.EXIT_SUCCESS_CODE, msg)%3B
                 }
-                    
+            }
        }
 
-
         ]]>
         </_XunitFact>
-      </AllCommamds>
-      <AllXUnitFacts Include= "%(AllCommamds._XunitFact)" />
+      </AllCommands>
+      <AllXUnitFacts Include= "%(AllCommands._XunitFact)" />
     </ItemGroup>
 
   </Target>
diff --git a/tests/src/CLRTest.Execute.Batch.targets b/tests/src/CLRTest.Execute.Batch.targets
index 6def6679e8..f8c27be279 100644
--- a/tests/src/CLRTest.Execute.Batch.targets
+++ b/tests/src/CLRTest.Execute.Batch.targets
@@ -137,6 +137,29 @@ IF NOT "%CLRTestExitCode%"=="%CLRTestExpectedExitCode%" (
         ]]></Command>
         <Description>Run testcases under debugger.</Description>
       </BatchCLRTestExecutionScriptArgument>
+
+      <BatchCLRTestExecutionScriptArgument Include="env">
+        <HasParam>true</HasParam>
+        <ParamName>envScriptFullPath</ParamName>
+        <Command><![CDATA[
+    IF EXIST "%2" (
+        set __TestEnv=%2
+    ) ELSE (
+        ECHO The environment script "%2" does not exist
+        GOTO :USAGE
+    )
+        ]]></Command>
+        <Description>Run the specified script to set environment variables before running the test.</Description>
+      </BatchCLRTestExecutionScriptArgument>
+
+      <BatchCLRTestExecutionScriptArgument Include="coreroot">
+        <HasParam>true</HasParam>
+        <ParamName>envScriptFullPath</ParamName>
+        <Command><![CDATA[
+    set CORE_ROOT=%2
+        ]]></Command>
+        <Description>Set CORE_ROOT to the specified value before running the test.</Description>
+      </BatchCLRTestExecutionScriptArgument>
     </ItemGroup>
       
     <ItemGroup>
diff --git a/tests/src/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs b/tests/src/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs
index 22de3fb97b..39281a8809 100644
--- a/tests/src/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs
+++ b/tests/src/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs
@@ -8,99 +8,58 @@ using System.Diagnostics;
 using System.IO;
 using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
+
 namespace CoreclrTestLib
 {
     public class CoreclrTestWrapperLib
     {
         public const int EXIT_SUCCESS_CODE = 0;
 
-        public int RunTest(string cmdLine, string outputfile, string errorfile)
+        public int RunTest(string executable, string outputFile, string errorFile)
         {
-            System.IO.TextWriter output_file = new System.IO.StreamWriter(new FileStream(outputfile, FileMode.Create));
-            System.IO.TextWriter err_file = new System.IO.StreamWriter(new FileStream(errorfile, FileMode.Create));
+            Debug.Assert(outputFile != errorFile);
 
             int exitCode = -100;
             int timeout = 1000 * 60*10;
+
+            var outputStream = new FileStream(outputFile, FileMode.Create);
+            var errorStream = new FileStream(errorFile, FileMode.Create);
+
+            using (var outputWriter = new StreamWriter(outputStream))
+            using (var errorWriter = new StreamWriter(errorStream))
             using (Process process = new Process())
             {
-                process.StartInfo.FileName = cmdLine;
+                process.StartInfo.FileName = executable;
                 process.StartInfo.UseShellExecute = false;
                 process.StartInfo.RedirectStandardOutput = true;
                 process.StartInfo.RedirectStandardError = true;
-                                
-
-                StringBuilder output = new StringBuilder();
-                StringBuilder error = new StringBuilder();
-
-                using (AutoResetEvent outputWaitHandle = new AutoResetEvent(false))
-                using (AutoResetEvent errorWaitHandle = new AutoResetEvent(false))
-                {
-                    process.OutputDataReceived += (sender, e) =>
-                    {
-                        if (e.Data == null)
-                        {
-                            try
-                            {
-                                outputWaitHandle.Set();
-                            }
-                            catch (ObjectDisposedException)
-                            {
-                                // Noop for access after timeout.
-                            }
-                        }
-                        else
-                        {
-                            output.AppendLine(e.Data);
-                        }
-                    };
-                    process.ErrorDataReceived += (sender, e) =>
-                    {
-                        if (e.Data == null)
-                        {
-                            try
-                            {
-                                errorWaitHandle.Set();
-                            }
-                            catch (ObjectDisposedException)
-                            {
-                                // Noop for access after timeout.
-                            }
-                        }
-                        else
-                        {
-                            error.AppendLine(e.Data);
-                        }
-                    };
 
-                    process.Start();
+                process.Start();
 
-                    process.BeginOutputReadLine();
-                    process.BeginErrorReadLine();
+                Task copyOutput = process.StandardOutput.BaseStream.CopyToAsync(outputStream);
+                Task copyError = process.StandardError.BaseStream.CopyToAsync(errorStream);
 
-                    if (process.WaitForExit(timeout) &&
-                        outputWaitHandle.WaitOne(timeout) &&
-                        errorWaitHandle.WaitOne(timeout))
-                    {
-                        // Process completed. Check process.ExitCode here.
-                        exitCode = process.ExitCode;
-                    }
-                    else
-                    {
-                        // Timed out.
-                        output.AppendLine("cmdLine:" + cmdLine + " Timed Out");
-                        error.AppendLine("cmdLine:" + cmdLine + " Timed Out");
-                    }
+                bool completed = process.WaitForExit(timeout) &&
+                    copyOutput.Wait(timeout) &&
+                    copyError.Wait(timeout);
 
-                   output_file.WriteLine(output.ToString());
-                   output_file.WriteLine("Test Harness Exitcode is : " + exitCode.ToString());
-                   output_file.Flush();
+                if (completed)
+                {
+                    // Process completed. Check process.ExitCode here.
+                    exitCode = process.ExitCode;
+                }
+                else
+                {
+                    // Timed out.
+                    outputWriter.WriteLine("cmdLine:" + executable + " Timed Out");
+                    errorWriter.WriteLine("cmdLine:" + executable + " Timed Out");
+                }
 
-                   err_file.WriteLine(error.ToString());
-                   err_file.Flush();
+               outputWriter.WriteLine("Test Harness Exitcode is : " + exitCode.ToString());
+               outputWriter.Flush();
 
-                   output_file.Dispose();
-                   err_file.Dispose();
-                }
+               errorWriter.Flush();
             }
 
             return exitCode;
diff --git a/tests/src/Common/Coreclr.TestWrapper/project.json b/tests/src/Common/Coreclr.TestWrapper/project.json
index cd536cf30e..668501240a 100644
--- a/tests/src/Common/Coreclr.TestWrapper/project.json
+++ b/tests/src/Common/Coreclr.TestWrapper/project.json
@@ -9,6 +9,7 @@
     "System.Runtime.Handles": "4.0.0-beta-23302",
     "System.Runtime.Loader": "4.0.0-beta-23302",
     "System.Threading": "4.0.10-beta-23302",
+    "System.Threading.Tasks": "4.0.10-beta-23302",
     "System.Globalization.Calendars": "4.0.0-beta-23302",
     "System.Globalization": "4.0.10-beta-23302",
     "System.Text.Encoding": "4.0.10-beta-23302",
@@ -30,4 +31,4 @@
   "frameworks": {
     "dnxcore50": {}
   }
-}
\ No newline at end of file
+}
diff --git a/tests/src/Common/Coreclr.TestWrapper/project.lock.json b/tests/src/Common/Coreclr.TestWrapper/project.lock.json
index 9860deb251..38c02b86b9 100644
--- a/tests/src/Common/Coreclr.TestWrapper/project.lock.json
+++ b/tests/src/Common/Coreclr.TestWrapper/project.lock.json
@@ -1914,6 +1914,7 @@
       "System.Runtime.Handles >= 4.0.0-beta-23302",
       "System.Runtime.Loader >= 4.0.0-beta-23302",
       "System.Threading >= 4.0.10-beta-23302",
+      "System.Threading.Tasks >= 4.0.10-beta-23302",
       "System.Globalization.Calendars >= 4.0.0-beta-23302",
       "System.Globalization >= 4.0.10-beta-23302",
       "System.Text.Encoding >= 4.0.10-beta-23302",