From 269e320e385fc1ba58b715054dbfc230199cef23 Mon Sep 17 00:00:00 2001
From: Simon Nattress <nattress@gmail.com>
Date: Thu, 20 Feb 2020 11:34:07 -0800
Subject: [PATCH] Run SuperIlc with CoreRun

---
 src/coreclr/tests/issues.targets                                 | 3 ---
 src/coreclr/tests/src/readytorun/coreroot_determinism/Program.cs | 5 +++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/coreclr/tests/issues.targets b/src/coreclr/tests/issues.targets
index ac8e8f9..02cf560 100644
--- a/src/coreclr/tests/issues.targets
+++ b/src/coreclr/tests/issues.targets
@@ -101,9 +101,6 @@
         <ExcludeList Include="$(XunitTestBinBase)/Loader/classloader/generics/Variance/Interfaces/Interfaces001/*">
             <Issue>https://github.com/dotnet/runtime/issues/3893</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/readytorun/coreroot_determinism/coreroot_determinism/*">
-            <Issue>32333</Issue>
-        </ExcludeList>
     </ItemGroup>
 
     <!-- All Unix targets -->
diff --git a/src/coreclr/tests/src/readytorun/coreroot_determinism/Program.cs b/src/coreclr/tests/src/readytorun/coreroot_determinism/Program.cs
index 6feb940..4f9706b 100644
--- a/src/coreclr/tests/src/readytorun/coreroot_determinism/Program.cs
+++ b/src/coreclr/tests/src/readytorun/coreroot_determinism/Program.cs
@@ -84,7 +84,8 @@ internal class Program
 
     public static bool CompileWithSeed(int seed, string coreRootPath, string compilationInputFolder, string outDir)
     {
-        string superIlcPath = Path.Combine(coreRootPath, "ReadyToRun.SuperIlc", OSExeSuffix("ReadyToRun.SuperIlc"));
+        string superIlcPath = Path.Combine(coreRootPath, "ReadyToRun.SuperIlc", "ReadyToRun.SuperIlc.dll");
+        string coreRunPath = Path.Combine(coreRootPath, OSExeSuffix("corerun"));
 
         Console.WriteLine($"================================== Compiling with seed {seed} ==================================");
         Environment.SetEnvironmentVariable("CoreRT_DeterminismSeed", seed.ToString());
@@ -93,7 +94,7 @@ internal class Program
             Directory.Delete(outDir, true);
         }
         Directory.CreateDirectory(outDir);
-        ProcessStartInfo processStartInfo = new ProcessStartInfo(superIlcPath, $"compile-directory -cr {coreRootPath} -in {compilationInputFolder} --nojit --noexe --large-bubble --release --nocleanup -out {outDir}");
+        ProcessStartInfo processStartInfo = new ProcessStartInfo(coreRunPath, $"{superIlcPath} compile-directory -cr {coreRootPath} -in {compilationInputFolder} --nojit --noexe --large-bubble --release --nocleanup -out {outDir}");
         var process = Process.Start(processStartInfo);
         process.WaitForExit();
         if (process.ExitCode != 0)
-- 
2.7.4