Re-Enable Windows tests with JitOptSensitive flag (#20697)

* Re-Enable windows with JitOptSensitive flag

The check in batch targets would keep us from running jitOptimiztionSensitiveTests
with COMPlus_TieredCompilation=0.

* Address pr feedback

diff --git a/tests/src/CLRTest.Execute.Batch.targets b/tests/src/CLRTest.Execute.Batch.targets
index 1b1d36e..34a2e21 100644 (file)
--- a/tests/src/CLRTest.Execute.Batch.targets
+++ b/tests/src/CLRTest.Execute.Batch.targets
@@ -79,16 +79,28 @@ IF NOT "%COMPlus_GCStress%"=="" (
       <BatchCLRTestEnvironmentCompatibilityCheck Condition="'$(JitOptimizationSensitive)' == 'true'">
     <![CDATA[
 $(BatchCLRTestEnvironmentCompatibilityCheck)
-IF "%COMPlus_JitStress%"=="" IF "%COMPlus_JitStressRegs%"=="" IF "%COMPlus_JITMinOpts%"=="" IF "%COMPlus_TailcallStress%"=="" IF "%COMPlus_TieredCompilation%"=="" goto :Compatible1
+REM JitOptimizationSensitive includes our set of tests which cannot run under:
+REM     JitMinOpts=1
+REM     JitStress=*
+REM     JitStressRegs=*
+REM     TailcallStress=1
+REM
+REM TieredCompilation will use minopts. Therefore it is also included in this
+REM set. Unlike the rest, TieredCompilation=0 should run the JitOptimizationSensitive
+REM tests. The following cannot run the test.
+REN
+REM     TieredCompilation=1
+REM     TieredCompilation=
+IF "%COMPlus_JitStress%"=="" IF "%COMPlus_JitStressRegs%"=="" IF "%COMPlus_JITMinOpts%"=="" IF "%COMPlus_TailcallStress%"=="" goto :Compatible
   ECHO SKIPPING EXECUTION BECAUSE ONE OR MORE OF (COMPlus_JitStress, COMPlus_JitStressRegs, COMPlus_JITMinOpts, COMPlus_TailcallStress, COMPlus_TieredCompilation) IS SET
   popd
   Exit /b 0
-:Compatible1
-IF "%COMPlus_TieredCompilation%"=="0" goto :Compatible2
+:Compatible
+IF "%COMPlus_TieredCompilation%"=="0" goto :TieredCompilationDisabledCorrectly
   ECHO SKIPPING EXECUTION BECAUSE COMPlus_TieredCompilation has not been disabled and this test is marked JitOptimizationSensitive
   popd
   Exit /b 0
-:Compatible2
+:TieredCompilationDisabledCorrectly
       ]]></BatchCLRTestEnvironmentCompatibilityCheck>
       <BatchCLRTestEnvironmentCompatibilityCheck Condition="'$(HeapVerifyIncompatible)' == 'true'"><![CDATA[
 $(BatchCLRTestEnvironmentCompatibilityCheck)