Skip to content

Commit 81e573e

Browse files
authored
Revert "Add interpreter pipeline (#116844)" (#117234)
This reverts commit 359769e.
1 parent 877b0cd commit 81e573e

File tree

5 files changed

+30
-85
lines changed

5 files changed

+30
-85
lines changed

eng/pipelines/common/templates/runtimes/run-test-job.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ parameters:
1515
condition: true
1616
displayNameArgs: ''
1717
runInUnloadableContext: false
18-
runInterpreter: false
1918
tieringTest: false
2019
runtimeVariant: ''
2120
variables: {}
@@ -309,7 +308,6 @@ jobs:
309308
runCrossGen2: ${{ eq(parameters.readyToRun, true) }}
310309
compositeBuildMode: ${{ parameters.compositeBuildMode }}
311310
runInUnloadableContext: ${{ parameters.runInUnloadableContext }}
312-
runInterpreter: ${{ parameters.runInterpreter }}
313311
tieringTest: ${{ parameters.tieringTest }}
314312
hotColdSplitting: ${{ parameters.hotColdSplitting }}
315313

eng/pipelines/common/templates/runtimes/send-to-helix-step.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ parameters:
2121
helixProjectArguments: ''
2222
extraHelixArguments: ''
2323
runInUnloadableContext: ''
24-
runInterpreter: ''
2524
tieringTest: ''
2625
hotColdSplitting: ''
2726
nativeAotTest: ''
@@ -56,7 +55,6 @@ steps:
5655
_RunCrossGen2: ${{ parameters.runCrossGen2 }}
5756
_CompositeBuildMode: ${{ parameters.compositeBuildMode }}
5857
_RunInUnloadableContext: ${{ parameters.runInUnloadableContext }}
59-
_RunInterpreter: ${{ parameters.runInterpreter }}
6058
_TieringTest: ${{ parameters.tieringTest }}
6159
_HotColdSplitting: ${{ parameters.hotColdSplitting }}
6260
_NativeAotTest: ${{ parameters.nativeAotTest }}

eng/pipelines/coreclr/interpreter.yml

Lines changed: 0 additions & 76 deletions
This file was deleted.

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

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ $__Command msbuild $CORE_ROOT/wasm-test-runner/WasmTestRunner.proj /p:NetCoreApp
371371
]]>
372372
</CLRTestBashPreCommands>
373373

374-
<BashCLRTestLaunchCmds Condition="'$(CLRTestKind)' == 'BuildAndRun' And '$(TargetOS)' != 'browser' And '$(TargetOS)' != 'android'">
374+
<BashCLRTestLaunchCmds Condition="'$(CLRTestKind)' == 'BuildAndRun' And '$(TargetOS)' != 'browser' And '$(TargetOS)' != 'android' And '$(TargetArchitecture)' != 'arm64'">
375375
<![CDATA[
376376
$(BashLinkerTestLaunchCmds)
377377
@@ -412,6 +412,35 @@ if [ ! -z ${RunCrossGen2+x} ]%3B then
412412
ReleaseLock
413413
fi
414414
415+
$(BashLinkerTestCleanupCmds)
416+
]]></BashCLRTestLaunchCmds>
417+
<BashCLRTestLaunchCmds Condition="'$(CLRTestKind)' == 'BuildAndRun' And '$(TargetOS)' != 'browser' And '$(TargetOS)' != 'android' And '$(TargetArchitecture)' == 'arm64'">
418+
<![CDATA[
419+
$(BashLinkerTestLaunchCmds)
420+
421+
if [ ! -z "$CLRCustomTestLauncher" ];
422+
then
423+
LAUNCHER="$CLRCustomTestLauncher $PWD/"
424+
elif [ "$_RunWithWatcher" == 1 ];
425+
then
426+
LAUNCHER="$(WatcherRunFile) $(CLRTestRunFile)"
427+
else
428+
LAUNCHER="$_DebuggerFullPath $_DebuggerArgsSeparator $(CLRTestRunFile)"
429+
fi
430+
431+
if [ ! -z ${RunCrossGen2+x} ]%3B then
432+
TakeLock
433+
fi
434+
435+
echo $LAUNCHER $ExePath %24(printf "'%s' " "${CLRTestExecutionArguments[@]}")
436+
$LAUNCHER $ExePath "${CLRTestExecutionArguments[@]}"
437+
438+
CLRTestExitCode=$?
439+
440+
if [ ! -z ${RunCrossGen2+x} ]%3B then
441+
ReleaseLock
442+
fi
443+
415444
$(BashLinkerTestCleanupCmds)
416445
]]></BashCLRTestLaunchCmds>
417446
<BashCLRTestLaunchCmds Condition="'$(CLRTestKind)' == 'BuildAndRun' And '$(TargetOS)' == 'browser'">

src/tests/Common/helixpublishwitharcade.proj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
<_LongRunningGCTests>false</_LongRunningGCTests>
4040
<_GcSimulatorTests>false</_GcSimulatorTests>
4141
<_RunInUnloadableContext>false</_RunInUnloadableContext>
42-
<_RunInterpreter>false</_RunInterpreter>
4342
<_TieringTest>false</_TieringTest>
4443
<_HotColdSplitting>false</_HotColdSplitting>
4544
<_NativeAotTest>false</_NativeAotTest>
@@ -99,7 +98,6 @@
9998
LongRunningGCTests=$(_LongRunningGCTests);
10099
GcSimulatorTests=$(_GcSimulatorTests);
101100
RunInUnloadableContext=$(_RunInUnloadableContext);
102-
RunInterpreter=$(_RunInterpreter);
103101
TieringTest=$(_TieringTest);
104102
HotColdSplitting=$(_HotColdSplitting);
105103
NativeAotTest=$(_NativeAotTest);
@@ -696,7 +694,6 @@
696694
<HelixPreCommand Include="set RunningLongGCTests=1" Condition=" '$(LongRunningGCTests)' == 'true' " />
697695
<HelixPreCommand Include="set RunningGCSimulatorTests=1" Condition=" '$(GcSimulatorTests)' == 'true' " />
698696
<HelixPreCommand Include="set RunInUnloadableContext=1" Condition=" '$(RunInUnloadableContext)' == 'true' " />
699-
<HelixPreCommand Include="set RunInterpreter=1" Condition=" '$(RunInterpreter)' == 'true' " />
700697
<HelixPreCommand Include="set RunTieringTest=1" Condition=" '$(TieringTest)' == 'true' " />
701698
<HelixPreCommand Include="set HotColdSplitting=1" Condition=" '$(HotColdSplitting)' == 'true' " />
702699
<HelixPreCommand Include="set CLRCustomTestLauncher=%HELIX_CORRELATION_PAYLOAD%\runincontext.cmd" Condition=" '$(RunInUnloadableContext)' == 'true' " />
@@ -750,7 +747,6 @@
750747
<HelixPreCommand Include="export RunningLongGCTests=1" Condition=" '$(LongRunningGCTests)' == 'true' " />
751748
<HelixPreCommand Include="export RunningGCSimulatorTests=1" Condition=" '$(GcSimulatorTests)' == 'true' " />
752749
<HelixPreCommand Include="export RunInUnloadableContext=1" Condition=" '$(RunInUnloadableContext)' == 'true' " />
753-
<HelixPreCommand Include="export RunInterpreter=1" Condition=" '$(RunInterpreter)' == 'true' " />
754750
<HelixPreCommand Include="export RunTieringTest=1" Condition=" '$(TieringTest)' == 'true' " />
755751
<HelixPreCommand Include="export HotColdSplitting=1" Condition=" '$(HotColdSplitting)' == 'true' " />
756752
<HelixPreCommand Include="export CLRCustomTestLauncher=$HELIX_CORRELATION_PAYLOAD/runincontext.sh" Condition=" '$(RunInUnloadableContext)' == 'true' " />

0 commit comments

Comments
 (0)