Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Standardize test script naming to CLRTestBa{tc,s}hP{re,ost}Commands #76483

Merged
merged 30 commits into from
Nov 4, 2022
Merged
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
ee6de1a
Extract environment variable changes from test/filecheck
markples Sep 2, 2022
da94e49
a few more
markples Sep 2, 2022
df75a0e
more tests
markples Sep 29, 2022
f28c714
more tests
markples Sep 29, 2022
51c2f3b
more tests
markples Sep 29, 2022
59e9423
more tests
markples Sep 29, 2022
f6b9454
more tests
markples Sep 29, 2022
943894b
more tests
markples Sep 29, 2022
dd30ce7
More tests
markples Sep 30, 2022
26b596b
Bash fix
markples Sep 30, 2022
24e297a
Manually [re]move comments, remove empty PropertyGroups
markples Sep 30, 2022
16a48dc
Standardize on CLRTestBatchPreCommands and CLRTestBa{s,tc}hPostCommands
markples Oct 1, 2022
dbb82fb
Start converting CLRTestBashPreCommands
markples Oct 1, 2022
70795e3
Convert RunWithGcStress to new envvar format
markples Oct 1, 2022
031d597
Standardize on CLRTestBashPreCommands
markples Oct 1, 2022
1412f34
Merge branch 'main' into test/naming
markples Oct 13, 2022
3278bfc
Convert more environment variables
markples Oct 13, 2022
5b59f92
put that quote back
markples Oct 13, 2022
9099d27
Merge remote-tracking branch 'dotnet/main' into test/naming
markples Oct 20, 2022
d78e100
finish merge
markples Oct 22, 2022
aedc682
Merge remote-tracking branch 'dotnet/main' into test/naming
markples Oct 22, 2022
8bd594c
Env vars in Runtime_75607
markples Oct 22, 2022
f67b54f
Restore destructive overwrite of precommands for wasm
markples Oct 25, 2022
9945798
Undo Runtime_76218 change
markples Nov 2, 2022
ab78cba
Merge remote-tracking branch 'dotnet/main' into test/naming
markples Nov 2, 2022
c6b99ea
Convert names in two newer tests
markples Nov 2, 2022
edb6fd5
typo
markples Nov 2, 2022
dc271bc
Merge remote-tracking branch 'dotnet/main' into HEAD
markples Nov 3, 2022
7b2b8bd
Also move new InstrumentedTiers to env var syntax
markples Nov 3, 2022
06a7059
back to DOTNET_
markples Nov 3, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/tests/Common/CLRTest.CrossGen.targets
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ fi
]]>
</CrossgenBashScript>

<BashCLRTestPreCommands>$(BashCLRTestPreCommands);$(CrossgenBashScript)</BashCLRTestPreCommands>
<CLRTestBashPreCommands>$(CLRTestBashPreCommands);$(CrossgenBashScript)</CLRTestBashPreCommands>
</PropertyGroup>
</Target>

Expand Down
17 changes: 6 additions & 11 deletions src/tests/Common/CLRTest.Execute.Bash.targets
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,8 @@ fi
<PropertyGroup>
<CLRTestRunFile Condition="'$(CLRTestIsHosted)'=='true'">"$CORE_ROOT/corerun" $(CoreRunArgs) ${__DotEnvArg}</CLRTestRunFile>

<BashCLRTestPreCommands Condition="'$(CLRTestKind)' == 'BuildAndRun' and '$(TargetArchitecture)' == 'wasm'">
<![CDATA[
<!-- Note that this overwrites CLRTestBashPreCommands rather than adding to it. -->
<CLRTestBashPreCommands Condition="'$(CLRTestKind)' == 'BuildAndRun' and '$(TargetArchitecture)' == 'wasm'"><![CDATA[
# Build wasm app containing the test dll
__Command=""
if [ ! -z ${__TestDotNetCmd+x} ] %3B then
Expand All @@ -292,7 +292,7 @@ export DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER=1
$__Command msbuild $CORE_ROOT/wasm-test-runner/WasmTestRunner.proj /p:NetCoreAppCurrent=$(NetCoreAppCurrent) /p:TestAssemblyFileName=$(MsBuildProjectName).dll /p:TestBinDir=`pwd` $(CLRTestMSBuildArgs) || exit $?

]]>
</BashCLRTestPreCommands>
</CLRTestBashPreCommands>

<BashCLRTestLaunchCmds Condition="'$(CLRTestKind)' == 'BuildAndRun' And $(TargetOS) != 'Browser' And '$(TargetOS)' != 'Android' And '$(TargetArchitecture)' != 'arm64'">
<![CDATA[
Expand Down Expand Up @@ -430,13 +430,8 @@ echo /usr/bin/env bash $(InputAssemblyName) %24(printf "'%s' " "${CLRTestExecuti
CLRTestExitCode=$?
CLRTestExpectedExitCode=0
]]></BashCLRTestLaunchCmds>

<BashCLRTestPostCommands><![CDATA[
$(BashDisasmCheckPostCommands)
$(CLRTestBashPostCommands)
]]></BashCLRTestPostCommands>

</PropertyGroup>

<PropertyGroup>
<BashEnvironmentVariables>
@(CLRTestBashEnvironmentVariable -> 'export %(Identity)=%(Value)', '%0a')
Expand Down Expand Up @@ -548,11 +543,11 @@ ExePath=$(InputAssemblyName)
export TestExclusionListPath=$CORE_ROOT/TestExclusionList.txt
$(BashEnvironmentVariables)
# PreCommands
$(BashCLRTestPreCommands)
$(CLRTestBashPreCommands)
# Launch
$(BashCLRTestLaunchCmds)
# PostCommands
$(BashCLRTestPostCommands)
$(CLRTestBashPostCommands)
$(BashCLRTestExitCodeCheck)
]]>
</_CLRTestExecutionScriptText>
Expand Down
9 changes: 2 additions & 7 deletions src/tests/Common/CLRTest.Execute.Batch.targets
Original file line number Diff line number Diff line change
Expand Up @@ -339,13 +339,8 @@ cmd /c $(InputAssemblyName)
set CLRTestExitCode=!ERRORLEVEL!
set CLRTestExpectedExitCode=0
]]></BatchCLRTestLaunchCmds>

<BatchCLRTestPostCommands><![CDATA[
$(BatchDisasmCheckPostCommands)
$(CLRTestBatchPostCommands)
]]></BatchCLRTestPostCommands>

</PropertyGroup>

<PropertyGroup>
<BatchEnvironmentVariables>
@(CLRTestBatchEnvironmentVariable -> 'set %(Identity)=%(Value)', '%0d%0a')
Expand Down Expand Up @@ -453,7 +448,7 @@ $(CLRTestBatchPreCommands)
REM Launch
$(BatchCLRTestLaunchCmds)
REM PostCommands
$(BatchCLRTestPostCommands)
$(CLRTestBatchPostCommands)
$(BatchCLRTestExitCodeCheck)
]]></_CLRTestExecutionScriptText>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/tests/Common/CLRTest.GC.targets
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ then
fi
]]></GCSimulatorTestBashScript>

<BashCLRTestPreCommands>$(BashCLRTestPreCommands);$(GCLongGCTestBashScript);$(GCSimulatorTestBashScript)</BashCLRTestPreCommands>
<CLRTestBashPreCommands>$(CLRTestBashPreCommands);$(GCLongGCTestBashScript);$(GCSimulatorTestBashScript)</CLRTestBashPreCommands>
<GCLongGCTestBatchScript Condition="'$(IsLongRunningGCTest)' != 'true'"><![CDATA[
REM Long GC script
if defined RunningLongGCTests (
Expand Down
55 changes: 17 additions & 38 deletions src/tests/Common/CLRTest.Jit.targets
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@ export RunningIlasmRoundTrip=
]]>
</IlasmRoundTripBashScript>

<IlasmRoundTripBashScript Condition="'$(CLRTestKind)' == 'BuildAndRun'">
<![CDATA[
<IlasmRoundTripBashScript Condition="'$(CLRTestKind)' == 'BuildAndRun'"><![CDATA[
# IlasmRoundTrip Script
# Disable Ilasm round-tripping for Linker tests.
# Todo: Ilasm round-trip on linked binaries.
Expand Down Expand Up @@ -192,14 +191,13 @@ IF NOT DEFINED DoLink (
</PropertyGroup>
</Target>

<Target Name="GetDisasmCheckData"
Returns="$(HasDisasmCheck);@(DisasmCheckFiles)">
<Target Name="GetDisasmCheckData">
<ItemGroup>
<DisasmCheckFiles Include="%(Compile.Identity)" Condition="'%(Compile.HasDisasmCheck)' == 'true'" />
</ItemGroup>
<PropertyGroup>
<HasDisasmCheck>false</HasDisasmCheck>
<HasDisasmCheck Condition="@(DisasmCheckFiles->Count()) &gt; 0 And '$(CLRTestKind)' == 'BuildAndRun' and '$(RunCrossGen2)' != '1'">true</HasDisasmCheck>
<HasDisasmCheck Condition="@(DisasmCheckFiles->Count()) &gt; 0 And '$(CLRTestKind)' == 'BuildAndRun'">true</HasDisasmCheck>

<GCStressIncompatible Condition="'$(HasDisasmCheck)' == 'true'">true</GCStressIncompatible>
<HeapVerifyIncompatible Condition="'$(HasDisasmCheck)' == 'true'">true</HeapVerifyIncompatible>
Expand All @@ -221,20 +219,16 @@ IF NOT DEFINED DoLink (
</Target>

<Target Name="GetDisasmCheckBashScript"
Returns="$(HasBashDisasmCheck);$(BashDisasmOutputFile);$(BashDisasmCheckPostCommands)"
DependsOnTargets="GetDisasmCheckData">
<PropertyGroup>
<HasBashDisasmCheck>false</HasBashDisasmCheck>
<HasBashDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr' and ('$(TargetOS)' == 'Linux' or '$(TargetOS)' == 'OSX') and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')">true</HasBashDisasmCheck>

<BashDisasmOutputFile>/dev/null</BashDisasmOutputFile>
<BashDisasmOutputFile Condition="'$(HasBashDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm.out</BashDisasmOutputFile>

<BashDisasmListOutputFile>/dev/null</BashDisasmListOutputFile>
<BashDisasmListOutputFile Condition="'$(HasBashDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm_list.out</BashDisasmListOutputFile>

<BashCLRTestPreCommands Condition="'$(HasBashDisasmCheck)' == 'true'"><![CDATA[
$(BashCLRTestPreCommands)
<CLRTestBashPreCommands Condition="'$(HasBashDisasmCheck)' == 'true'"><![CDATA[
$(CLRTestBashPreCommands)
if [[ ( -z "$DOTNET_JitStress" ) && ( -z "$DOTNET_JitStressRegs" ) && ( -z "$DOTNET_TailcallStress" ) && ( "$DOTNET_TieredPGO" != "1" ) && ( -z "$RunCrossGen2" ) && ( -z "$DOTNET_JitForceControlFlowGuard" ) ]]; then
@(DisasmCheckFiles -> ' dotnet $CORE_ROOT/SuperFileCheck/SuperFileCheck.dll --csharp-list-method-names "%(Identity)" --allow-unused-prefixes --check-prefixes=CHECK,$(TargetArchitecture.ToUpperInvariant()),$(TargetArchitecture.ToUpperInvariant())-$(TargetOS.ToUpperInvariant()) > "$(BashDisasmListOutputFile)"
ERRORLEVEL=$?
Expand All @@ -248,10 +242,10 @@ if [[ ( -z "$DOTNET_JitStress" ) && ( -z "$DOTNET_JitStressRegs" ) && ( -z "$DOT
fi', '%0a')
fi
]]>
</BashCLRTestPreCommands>
</CLRTestBashPreCommands>

<BashDisasmCheckPostCommands></BashDisasmCheckPostCommands>
<BashDisasmCheckPostCommands Condition="'$(HasBashDisasmCheck)' == 'true'"><![CDATA[
<CLRTestBashPostCommands Condition="'$(HasBashDisasmCheck)' == 'true'"><![CDATA[
$(CLRTestBashPostCommands)
if [[ -n $DOTNET_JitDisasm ]]; then
@(DisasmCheckFiles -> ' dotnet $CORE_ROOT/SuperFileCheck/SuperFileCheck.dll --csharp "%(Identity)" --allow-unused-prefixes --check-prefixes=CHECK,$(TargetArchitecture.ToUpperInvariant()),$(TargetArchitecture.ToUpperInvariant())-$(TargetOS.ToUpperInvariant()) --dump-input-context 40 --input-file "$(BashDisasmOutputFile)"
ERRORLEVEL=$?
Expand All @@ -262,26 +256,22 @@ if [[ -n $DOTNET_JitDisasm ]]; then
fi', '%0a')
fi
]]>
</BashDisasmCheckPostCommands>
</CLRTestBashPostCommands>
</PropertyGroup>
</Target>

<Target Name="GetDisasmCheckBatchScript"
Returns="$(HasBatchDisasmCheck);$(BatchDisasmOutputFile);$(BatchDisasmCheckPostCommands)"
DependsOnTargets="GetDisasmCheckData">
<PropertyGroup>
<HasBatchDisasmCheck>false</HasBatchDisasmCheck>
<HasBatchDisasmCheck Condition="'$(HasDisasmCheck)' == 'true' and '$(RuntimeFlavor)' == 'coreclr'">true</HasBatchDisasmCheck>

<BatchDisasmOutputFile>NUL</BatchDisasmOutputFile>
<BatchDisasmOutputFile Condition="'$(HasBatchDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm.out</BatchDisasmOutputFile>

<BatchDisasmListOutputFile>NUL</BatchDisasmListOutputFile>
<BatchDisasmListOutputFile Condition="'$(HasBatchDisasmCheck)' == 'true'">$(scriptPath)__jit_disasm_list.out</BatchDisasmListOutputFile>

<CLRTestBatchPreCommands Condition="'$(HasBatchDisasmCheck)' == 'true'">
<![CDATA[
$(CLRTestBatchPreCommands)
$(CLRTestBatchPreCommands)
IF "%DOTNET_JitStress%"=="" IF "%DOTNET_JitStressRegs%"=="" IF "%DOTNET_TailcallStress%"=="" IF NOT "%DOTNET_TieredPGO%" == "1" IF NOT "%RunCrossGen2%" == "1" IF "%DOTNET_JitForceControlFlowGuard%"=="" (
@(DisasmCheckFiles -> ' dotnet %CORE_ROOT%\SuperFileCheck\SuperFileCheck.dll --csharp-list-method-names "%(Identity)" --check-prefixes=CHECK,$(TargetArchitecture.ToUpperInvariant()),$(TargetArchitecture.ToUpperInvariant())-$(TargetOS.ToUpperInvariant()) > "$(BatchDisasmListOutputFile)"
IF NOT "!ERRORLEVEL!" == "0" (
Expand All @@ -295,8 +285,8 @@ IF "%DOTNET_JitStress%"=="" IF "%DOTNET_JitStressRegs%"=="" IF "%DOTNET_Tailcall
]]>
</CLRTestBatchPreCommands>

<BatchDisasmCheckPostCommands></BatchDisasmCheckPostCommands>
<BatchDisasmCheckPostCommands Condition="'$(HasBatchDisasmCheck)' == 'true'"><![CDATA[
<CLRTestBatchPostCommands Condition="'$(HasBatchDisasmCheck)' == 'true'"><![CDATA[
$(CLRTestBatchPostCommands)
IF NOT "%DOTNET_JitDisasm%" == "" (
@(DisasmCheckFiles -> ' dotnet %CORE_ROOT%\SuperFileCheck\SuperFileCheck.dll --csharp "%(Identity)" --allow-unused-prefixes --check-prefixes=CHECK,$(TargetArchitecture.ToUpperInvariant()),$(TargetArchitecture.ToUpperInvariant())-$(TargetOS.ToUpperInvariant()) --dump-input-context 40 --input-file "$(BatchDisasmOutputFile)"
IF NOT "!ERRORLEVEL!" == "0" (
Expand All @@ -305,7 +295,7 @@ IF NOT "%DOTNET_JitDisasm%" == "" (
)', '%0d%0a')
)
]]>
</BatchDisasmCheckPostCommands>
</CLRTestBatchPostCommands>
</PropertyGroup>
</Target>

Expand Down Expand Up @@ -373,20 +363,9 @@ set DOTNET_JitPath=%CORE_ROOT%\superpmi-shim-collector.dll
***********************************************************************************************
-->

<PropertyGroup Condition="$(RunWithGcStress) != ''" >
<CLRTestBatchPreCommands>
<![CDATA[
$(CLRTestBatchPreCommands)
set DOTNET_GCStress=$(RunWithGcStress)
]]>
</CLRTestBatchPreCommands>
<BashCLRTestPreCommands>
<![CDATA[
$(BashCLRTestPreCommands)
export DOTNET_GCStress=$(RunWithGcStress)
]]>
</BashCLRTestPreCommands>
</PropertyGroup>

<ItemGroup>
<CLRTestEnvironmentVariable Condition="'$(RunWithGcStress)' != ''"
Include="DOTNET_GCStress" Value="$(RunWithGcStress)" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
set DOTNET_GCStress=0x3
set DOTNET_GCSegmentSize=8000
]]></CLRTestBatchPreCommands>
<BashCLRTestPreCommands><![CDATA[
$(BashCLRTestPreCommands)
<CLRTestBashPreCommands><![CDATA[
$(CLRTestBashPreCommands)
export DOTNET_TieredCompilation=0
export DOTNET_GCStress=0x3
export DOTNET_GCSegmentSize=8000
]]></BashCLRTestPreCommands>
]]></CLRTestBashPreCommands>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildProjectName).cs" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="DllImportPathTest.cs" />
</ItemGroup>
<ItemGroup>

<CLRTestBashEnvironmentVariable Include="LD_LIBRARY_PATH" Value="$LD_LIBRARY_PATH:$%28pwd)/Subdirectory" />
</ItemGroup>
<PropertyGroup>
<PathEnvSetupCommands><![CDATA[
mkdir Subdirectory
]]></PathEnvSetupCommands>
<BashCLRTestPreCommands>$(BashCLRTestPreCommands);$(PathEnvSetupCommands)</BashCLRTestPreCommands>
<CLRTestBashPreCommands>$(CLRTestBashPreCommands);$(PathEnvSetupCommands)</CLRTestBashPreCommands>
</PropertyGroup>
<ItemGroup>
<CMakeProjectReference Include="CMakeLists.txt" />
Expand Down
6 changes: 3 additions & 3 deletions src/tests/JIT/PGO/InstrumentedTiers/InstrumentedTiers.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
set DOTNET_TieredPGO=1
set DOTNET_TieredPGO_InstrumentOnlyHotCode=1
]]></CLRTestBatchPreCommands>
<BashCLRTestPreCommands><![CDATA[
$(BashCLRTestPreCommands)
<CLRTestBashPreCommands><![CDATA[
$(CLRTestBashPreCommands)
export DOTNET_TieredCompilation=1
export DOTNET_TieredPGO=1
export DOTNET_TieredPGO_InstrumentOnlyHotCode=1
]]></BashCLRTestPreCommands>
]]></CLRTestBashPreCommands>
</PropertyGroup>
<ItemGroup>
<Compile Include="InstrumentedTiers.cs" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,16 @@
<DebugType>None</DebugType>
<Optimize>True</Optimize>
</PropertyGroup>
<PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildProjectName).cs" />

<!-- This test requires GCStress to trigger the regression. Set DOTNET_GCStress here. However,
not all CI platforms support GCStress. In particular, macOS and Alpine do not (currently).
All Windows support GCStress. We don't have any way (currently) to determine if we're
running on a platform that supports GCStress. So, don't set GCStress for non-Windows (Bash).
The test will run under GCStress in normal, scheduled GCStress runs, when only the supported
platforms are run with GCStress.
-->
<CLRTestBatchPreCommands><![CDATA[
$(CLRTestBatchPreCommands)
set DOTNET_GCStress=0xc
]]></CLRTestBatchPreCommands>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildProjectName).cs" />
<CLRTestBatchEnvironmentVariable Include="DOTNET_GCStress" Value="0xc" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@
<DebugType>None</DebugType>
<Optimize>True</Optimize>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<CLRTestBatchPreCommands><![CDATA[
$(CLRTestBatchPreCommands)
set DOTNET_GCStress=0xC
]]></CLRTestBatchPreCommands>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildProjectName).cs" />

<CLRTestBatchEnvironmentVariable Include="DOTNET_GCStress" Value="0xC" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,10 @@
<DebugType>None</DebugType>
<Optimize>True</Optimize>
</PropertyGroup>
<PropertyGroup>
<CLRTestBatchPreCommands><![CDATA[
$(CLRTestBatchPreCommands)
set COMPlus_TieredPGO=1
set COMPlus_TC_QuickJitForLoops=1
]]></CLRTestBatchPreCommands>
<BashCLRTestPreCommands><![CDATA[
$(BashCLRTestPreCommands)
export COMPlus_TieredPGO=1
export COMPlus_TC_QuickJitForLoops=1
]]></BashCLRTestPreCommands>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildProjectName).cs" />

<CLRTestEnvironmentVariable Include="DOTNET_TieredPGO" Value="1" />
<CLRTestEnvironmentVariable Include="DOTNET_TC_QuickJitForLoops" Value="1" />
</ItemGroup>
</Project>
12 changes: 7 additions & 5 deletions src/tests/JIT/SIMD/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,19 @@
<CLRTestBatchPreCommands>
<![CDATA[
$(CLRTestBatchPreCommands)
set DOTNET_JitFuncInfoLogFile=SIMD.log
if EXIST SIMD.log (del SIMD.log)
]]>
</CLRTestBatchPreCommands>
<BashCLRTestPreCommands>
<CLRTestBashPreCommands>
<![CDATA[
$(BashCLRTestPreCommands)
export DOTNET_JitFuncInfoLogFile=SIMD.log
$(CLRTestBashPreCommands)
rm -f SIMD.log
]]>
</BashCLRTestPreCommands>
</CLRTestBashPreCommands>
</PropertyGroup>

<ItemGroup>
<CLRTestBashEnvironmentVariable Include="COMPlus_JitFuncInfoLogFile" Value="SIMD.log" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you revert this from DOTNET_ to COMPlus_?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for catching this. I think what happened is (1) I started this change before the COMPlus_ rename, (2) it has been open a long time due to it not being my highest priority and test failures (some real, some not), (3) I missed it when I merged the rename, and (4) my re-checks for envvar, complus_, precommands were limited to *proj and missed this file. I checked again and also found some envvars in the new InstrumentedTiers.csproj (which I have less excuse for since I had already renamed the PreCommands variable in it...)

</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions src/tests/Loader/NativeLibs/FromNativePaths.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<PathEnvSetupCommands><![CDATA[
mkdir Subdirectory
]]></PathEnvSetupCommands>
<BashCLRTestPreCommands>$(BashCLRTestPreCommands);$(PathEnvSetupCommands)</BashCLRTestPreCommands>
<CLRTestBatchPreCommands>$(BatchCLRTestPreCommands);$(PathEnvSetupCommands)</CLRTestBatchPreCommands>
<CLRTestBashPreCommands>$(CLRTestBashPreCommands);$(PathEnvSetupCommands)</CLRTestBashPreCommands>
<CLRTestBatchPreCommands>$(CLRTestBatchPreCommands);$(PathEnvSetupCommands)</CLRTestBatchPreCommands>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ set "COMPlus_ReadyToRun="
endlocal
set CLRCustomTestLauncher=RunBasicTestWithMcj.cmd --runCustomTest
]]></CLRTestBatchPreCommands>
<BashCLRTestPreCommands><![CDATA[
$(BashCLRTestPreCommands)
<CLRTestBashPreCommands><![CDATA[
$(CLRTestBashPreCommands)
mkdir r2r

# Suppress some DOTNET and COMPlus variables for the duration of Crossgen2 execution
Expand All @@ -52,6 +52,6 @@ export DOTNET_GCName DOTNET_GCStress DOTNET_HeapVerify DOTNET_ReadyToRun
export COMPlus_GCName COMPlus_GCStress COMPlus_HeapVerify COMPlus_ReadyToRun
chmod +x ./RunBasicTestWithMcj.sh
export CLRCustomTestLauncher="./RunBasicTestWithMcj.sh --runCustomTest"
]]></BashCLRTestPreCommands>
]]></CLRTestBashPreCommands>
</PropertyGroup>
</Project>
Loading