Update IL.targets to handle more properties

Also added exclusions for tests failing
because we are now paying attention to
properties.

diff --git a/tests/issues.targets b/tests/issues.targets
index 02996a0..e7c6a00 100644 (file)
--- a/tests/issues.targets
+++ b/tests/issues.targets
@@ -40,5 +40,14 @@
         <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M13-RTM\b99969\b99969\*" >
             <Issue>2286</Issue>
         </ExcludeList>
+       <ExcludeList Include="$(XunitTestBinBase)\JIT\opt\Tailcall\TailcallVerifyWithPrefix\TailcallVerifyWithPrefix.cmd" >
+            <Issue>2329</Issue>
+       </ExcludeList>
+       <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Arrays\misc\_il_dbgarrres\_il_dbgarrres.cmd" >
+            <Issue>2330</Issue>
+       </ExcludeList>
+       <ExcludeList Include="$(XunitTestBinBase)\JIT\Methodical\Arrays\misc\_il_relarrres\_il_relarrres.cmd" >
+            <Issue>2330</Issue>
+       </ExcludeList>
     </ItemGroup>
 </Project>

diff --git a/tests/src/IL.targets b/tests/src/IL.targets
index 0096377..2d549be 100644 (file)
--- a/tests/src/IL.targets
+++ b/tests/src/IL.targets
@@ -13,11 +13,17 @@
     <PropertyGroup>
       <_OutputTypeArgument Condition="'$(OutputType)' == 'Library'">/DLL</_OutputTypeArgument>
       <_OutputTypeArgument Condition="'$(OutputType)' == 'Exe'">/EXE</_OutputTypeArgument>
-
-      <_KeyFileArgument Condition="'$(KeyOriginatorFile)' != ''">/KEY=$(KeyOriginatorFile)</_KeyFileArgument>
+      <_IlasmSwitches>/QUIET /NOLOGO</_IlasmSwitches>
+      <_IlasmSwitches Condition="'$(KeyOriginatorFile)' != ''">$(_IlasmSwitches) /KEY=$(KeyOriginatorFile)</_IlasmSwitches>
+      <_IlasmSwitches Condition="'$(FoldIdenticalMethods)' == 'True'">$(_IlasmSwitches) /FOLD</_IlasmSwitches>
+      <_IlasmSwitches Condition="'$(SizeOfStackReserve)' != ''">$(_IlasmSwitches) /STACK=$(SizeOfStackReserve)</_IlasmSwitches>
+      <_IlasmSwitches Condition="'$(DebugType)' == 'Full'">$(_IlasmSwitches) /DEBUG</_IlasmSwitches>
+      <_IlasmSwitches Condition="'$(DebugType)' == 'Impl'">$(_IlasmSwitches) /DEBUG=IMPL</_IlasmSwitches>
+      <_IlasmSwitches Condition="'$(DebugType)' == 'PdbOnly'">$(_IlasmSwitches) /DEBUG=OPT</_IlasmSwitches>
+      <_IlasmSwitches Condition="'$(Optimize)' == 'True'">$(_IlasmSwitches) /OPTIMIZE</_IlasmSwitches>
     </PropertyGroup>
 
-    <Exec Command="ilasm /QUIET $(_OutputTypeArgument) /OUTPUT=@(IntermediateAssembly) $(_KeyFileArgument) @(Compile)">
+    <Exec Command="ilasm $(_OutputTypeArgument) /OUTPUT=@(IntermediateAssembly) $(_IlasmSwitches) @(Compile)">
       <Output TaskParameter="ExitCode" PropertyName="_ILAsmExitCode" />
     </Exec>
     <Error Text="ILAsm failed" Condition="'$(_ILAsmExitCode)' != '0'" />

diff --git a/tests/testsFailingOutsideWindows.txt b/tests/testsFailingOutsideWindows.txt
index a7427bd..f22e623 100644 (file)
--- a/tests/testsFailingOutsideWindows.txt
+++ b/tests/testsFailingOutsideWindows.txt
@@ -111,3 +111,8 @@ JIT/opt/Tailcall/TailcallVerifyWithPrefix/TailcallVerifyWithPrefix.sh
 Loader/NativeLibs/FromNativePaths/FromNativePaths.sh
 JIT/Methodical/Boxing/misc/_dbgconcurgc_il/_dbgconcurgc_il.sh
 JIT/jit64/gc/regress/vswhidbey/143837/143837.sh
+JIT/Methodical/Invoke/25params/25param1c_il_d/25param1c_il_d.sh
+JIT/Methodical/Invoke/25params/25param3c_il_d/25param3c_il_d.sh
+JIT/Methodical/Invoke/25params/25paramMixed_il_d/25paramMixed_il_d.sh
+JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79250/b79250/b79250.sh
+JIT/Methodical/Boxing/misc/_relconcurgc_il/_relconcurgc_il.sh