Remove support for running illink on runtime tests while testing (#122315)

Author: jkoritzinsky

docs/workflow/ci/triaging-failures.md

@@ -60,12 +60,6 @@ set RunningIlasmRoundTrip=1
 ```
 triggers an ildasm/ilasm round-trip test (that is, the test assembly is disassembled, then re-assembled, then run).
 
-And,
-```
-set DoLink=1
-```
-triggers ILLink testing.
-
 ## Product and test assets
 
 To reproduce and/or debug a test failure, you'll need the product and test assets. You can either build these using the normal build processes,

src/tests/Common/CLRTest.Execute.Bash.targets

@@ -274,94 +274,6 @@ fi
         <Description>Run the tests using the test watcher.</Description>
       </BashCLRTestExecutionScriptArgument>
     </ItemGroup>
-
-      <PropertyGroup>
-          <ReflectionRootsXml>$(AssemblyName).reflect.xml</ReflectionRootsXml>
-          <BashLinkerTestLaunchCmds>
-              <![CDATA[
-# Linker commands
-
-LinkBin=__Link
-Assemblies="-a System.Private.CoreLib"
-ReflectionRoots=
-
-shopt -s nullglob
-
-if [ ! -z "$DoLink" ];
-then
-  if [ ! -x "$ILLINK" ];
-  then
-    echo "Illink executable [$ILLINK] Invalid"
-    exit 1
-  fi
-
-  # Clean up old Linked binaries, if any
-  rm -rf $LinkBin
-
-  # Remove Native images, since the goal is to run from Linked binaries
-  rm -f *.ni.*
-
-  # Use hints for reflection roots, if provided in $(ReflectionRootsXml)
-  if [ -f $(ReflectionRootsXml) ];
-  then
-    ReflectionRoots="-x $(ReflectionRootsXml)"
-  fi
-
-  # Include all .exe files in this directory as entry points (some tests had multiple .exe file modules)
-  for bin in *.exe *.dll;
-  do
-    Assemblies="$Assemblies -a ${bin%.*}"
-  done
-
-  # Run dotnet-linker
-  # Run the Linker such that all assemblies except System.Private.Corlib.dll are linked
-  # Debug symbol generation needs some fixes, and is currently omitted.
-  # Once this is fixed, add -b true option.
-  echo "$ILLINK -out $LinkBin -d $CORE_ROOT -c link -l none -t $Assemblies $ReflectionRoots"
-  $ILLINK -out $LinkBin -d $CORE_ROOT -c link -l none -t $Assemblies $ReflectionRoots
-  ERRORLEVEL=$?
-  if [  $ERRORLEVEL -ne 0 ]
-  then
-    echo ILLINK FAILED $ERRORLEVEL
-    if [ -z "$KeepLinkedBinaries" ];
-    then
-      rm -rf $LinkBin
-    fi
-    exit 1
-  fi
-
-  # Copy CORECLR native binaries and the test watcher to $LinkBin,
-  # so that we can run the test based on that directory
-  cp $CORE_ROOT/*.so $LinkBin/
-  cp $CORE_ROOT/corerun $LinkBin/
-  cp $CORE_ROOT/watchdog $LinkBin/
-
-  # Copy some files that may be arguments
-  for f in *.txt;
-  do
-    [ -e "$f" ] && cp $f $LinkBin
-  done
-
-  ExePath=$LinkBin/$(InputAssemblyName)
-  export CORE_ROOT=$PWD/$LinkBin
-fi
-]]>
-          </BashLinkerTestLaunchCmds>
-          <BashLinkerTestCleanupCmds>
-              <![CDATA[
-# Clean up the LinkBin directories after test execution.
-# Otherwise, RunTests may run out of disk space.
-
-if [ ! -z "$DoLink" ];
-then
-  if [ -z "$KeepLinkedBinaries" ];
-  then
-    rm -rf $LinkBin
-  fi
-fi
-]]>
-          </BashLinkerTestCleanupCmds>
-      </PropertyGroup>
       <PropertyGroup>
       <CLRTestRunFile Condition="'$(CLRTestIsHosted)'=='true'">"$CORE_ROOT/corerun" $(CoreRunArgs)  ${__DotEnvArg}</CLRTestRunFile>
       <WatcherRunFile>"$CORE_ROOT/watchdog" $_WatcherTimeoutMins</WatcherRunFile>
@@ -386,8 +298,6 @@ $__Command msbuild $CORE_ROOT/wasm-test-runner/WasmTestRunner.proj /p:NetCoreApp
 
       <BashCLRTestLaunchCmds Condition="'$(CLRTestKind)' == 'BuildAndRun' And '$(TargetOS)' != 'browser' And '$(TargetOS)' != 'android'">
     <![CDATA[
-$(BashLinkerTestLaunchCmds)
-
 _DebuggerArgsSeparator=
 if [[ "$_DebuggerFullPath" == *lldb* ]];
 then
@@ -425,8 +335,6 @@ CLRTestExitCode=$?
 if [ ! -z ${RunCrossGen2+x} ]%3B then
   ReleaseLock
 fi
-
-$(BashLinkerTestCleanupCmds)
       ]]></BashCLRTestLaunchCmds>
       <BashCLRTestLaunchCmds Condition="'$(CLRTestKind)' == 'BuildAndRun' And '$(TargetOS)' == 'browser'">
       <![CDATA[

src/tests/Common/CLRTest.Execute.Batch.targets

@@ -253,75 +253,6 @@ Exit /b 0
       </BatchCLRTestExecutionScriptArgument>
     </ItemGroup>
 
-      <PropertyGroup>
-          <ReflectionRootsXml>$(AssemblyName).reflect.xml</ReflectionRootsXml>
-          <BatchLinkerTestLaunchCmds><![CDATA[
-REM Linker commands
-
-set LinkBin=__Link
-set Assemblies=-a System.Private.CoreLib
-
-IF defined DoLink (
-    IF NOT EXIST !ILLINK! (
-      ECHO ILLink executable [%ILLINK%] Invalid
-      popd
-      Exit /b 1
-    )
-
-    REM Clean up old Linked binaries, if any
-    IF EXIST %LinkBin% rmdir /s /q %LinkBin%
-
-    REM Remove Native images, since the goal is to run from Linked binaries
-    del /q /f *.ni.* 2> nul
-
-    REM Use hints for reflection roots, if provided in $(ReflectionRootsXml)
-    IF EXIST $(ReflectionRootsXml) set ReflectionRoots=-x $(ReflectionRootsXml)
-
-    REM Include all .exe files in this directory as entry points (some tests had multiple .exe file modules)
-    FOR /F "delims=" %%E IN ('dir /b *.exe *.dll') DO SET Assemblies=!Assemblies! -a %%~nE
-
-    REM Run dotnet-linker
-    REM Run the Linker such that all assemblies except System.Private.Corlib.dll are linked
-    REM Debug symbol generation needs some fixes, and is currently omitted.
-    REM Once this is fixed, add -b true option.
-    ECHO %ILLINK% -out %LinkBin% -d %CORE_ROOT% -c link -l none -t !Assemblies! !ReflectionRoots!
-    %ILLINK% -out %LinkBin% -d %CORE_ROOT% -c link -l none -t !Assemblies! !ReflectionRoots!
-    IF NOT "!ERRORLEVEL!"=="0" (
-      ECHO ILLINK FAILED !ERRORLEVEL!
-      IF NOT defined KeepLinkedBinaries (
-          IF EXIST %LinkBin% rmdir /s /q %LinkBin%
-      )
-      popd
-      Exit /b 1
-    )
-
-    REM Copy CORECLR native binaries and the test watcher to %LinkBin%, so that we can run the test based on that directory
-    copy %CORE_ROOT%\clrjit.dll %LinkBin% > nul 2> nul
-    copy %CORE_ROOT%\coreclr.dll %LinkBin% > nul 2> nul
-    copy %CORE_ROOT%\CoreRun.exe %LinkBin% > nul 2> nul
-    copy %CORE_ROOT%\watchdog.exe %LinkBin% > nul 2> nul
-
-    REM Copy some files that may be arguments
-    copy *.txt %LinkBin% > nul 2> nul
-
-    set ExePath=%LinkBin%\$(InputAssemblyName)
-    set CORE_ROOT=%scriptPath%\%LinkBin%
-)
-]]>
-          </BatchLinkerTestLaunchCmds>
-          <BatchLinkerTestCleanupCmds>
-              <![CDATA[
-REM Clean up the LinkBin directories after test execution.
-REM Otherwise, RunTests may run out of disk space.
-
-if defined DoLink (
-    if not defined KeepLinkedBinaries (
-        IF EXIST %LinkBin% rmdir /s /q %LinkBin%
-    )
-)
-]]>
-          </BatchLinkerTestCleanupCmds>
-      </PropertyGroup>
       <PropertyGroup>
       <CLRTestRunFile Condition="'$(CLRTestIsHosted)'=='true'">"%CORE_ROOT%\corerun.exe" $(CoreRunArgs) %__DotEnvArg%</CLRTestRunFile>
       <WatcherRunFile>"%CORE_ROOT%\watchdog.exe" %_WatcherTimeoutMins%</WatcherRunFile>
@@ -333,7 +264,6 @@ COPY /y %CORE_ROOT%\CoreShim.dll .
       ]]></BatchCopyCoreShimLocalCmds>
       <BatchCLRTestLaunchCmds Condition="'$(CLRTestKind)' == 'BuildAndRun' And $(TargetOS) != 'android'">
     <![CDATA[
-$(BatchLinkerTestLaunchCmds)
 $(BatchCopyCoreShimLocalCmds)
 
 IF NOT "%CLRCustomTestLauncher%"=="" (
@@ -360,7 +290,6 @@ set CLRTestExitCode=!ERRORLEVEL!
 if defined RunCrossGen2 (
   call :ReleaseLock
 )
-$(BatchLinkerTestCleanupCmds)
       ]]></BatchCLRTestLaunchCmds>
       <BatchCLRTestLaunchCmds Condition="'$(CLRTestKind)' == 'BuildAndRun' And $(TargetOS) == 'android'">
     <![CDATA[

src/tests/Common/CLRTest.Jit.targets

@@ -13,7 +13,7 @@ This file contains the logic for generating command scripts for special GC tests
 WARNING:   When setting properties based on their current state (for example:
            <Foo Condition="'$(Foo)'==''>Bar</Foo>).  Be very careful.  Another script generation
            target might be trying to do the same thing.  It's better to avoid this by instead setting a new property.
-           
+
            Additionally, be careful with itemgroups.  Include will propagate outside of the target too!
 
 ***********************************************************************************************
@@ -57,10 +57,8 @@ export RunningIlasmRoundTrip=
 
       <IlasmRoundTripBashScript Condition="'$(CLRTestKind)' == 'BuildAndRun'"><![CDATA[
 # IlasmRoundTrip Script
-# Disable Ilasm round-tripping for Linker tests.
-# Todo: Ilasm round-trip on linked binaries.
 
-if [ -z "$DoLink" -a ! -z "$RunningIlasmRoundTrip" ];
+if [ -n "$RunningIlasmRoundTrip" ];
 then
   python3 $(AssemblyName)_ilasmroundtrip.py
   ERRORLEVEL=$?
@@ -95,13 +93,11 @@ REM IlasmRoundTrip Script
 REM Disable Ilasm round-tripping for Linker tests.
 REM Todo: Ilasm round-trip on linked binaries.
 
-IF NOT DEFINED DoLink (
-  IF DEFINED RunningIlasmRoundTrip (
-    python $(AssemblyName)_ilasmroundtrip.py
-    IF NOT "!ERRORLEVEL!"=="0" (
-      ECHO ILASM ROUND-TRIP - FAILED !ERRORLEVEL!
-      Exit /b 1
-    )
+IF DEFINED RunningIlasmRoundTrip (
+  python $(AssemblyName)_ilasmroundtrip.py
+  IF NOT "!ERRORLEVEL!"=="0" (
+    ECHO ILASM ROUND-TRIP - FAILED !ERRORLEVEL!
+    Exit /b 1
   )
 )
 ]]>
@@ -225,7 +221,7 @@ IF NOT "%DOTNET_JitDisasm%" == "" (
   ***********************************************************************************************
   SuperPMI collection of CoreCLR tests
   ***********************************************************************************************
-  
+
   You shouldn't have to escape characters in a CDATA block, but it appears that you do actually need
   to escape semicolons with %3B here.
   -->
@@ -462,4 +458,4 @@ print("")
       Include="DOTNET_GCStress" Value="$(RunWithGcStress)" />
   </ItemGroup>
 
-</Project> 
+</Project>

src/tests/Common/scripts/bringup_runtest.sh

@@ -1086,10 +1086,6 @@ do
         --jitforcerelocs)
             export DOTNET_ForceRelocs=1
             ;;
-        --link=*)
-            export ILLINK=${i#*=}
-            export DoLink=true
-            ;;
         --tieredcompilation)
             export DOTNET_TieredCompilation=1
             ;;