Fix crossgen executable name

dotnet · Oct 13, 2024 · bda222f · bda222f
1 parent 1ea1078
commit bda222f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/eng/pipelines/coreclr/templates/crossgen2-comparison-job.yml b/eng/pipelines/coreclr/templates/crossgen2-comparison-job.yml
@@ -122,12 +122,10 @@ jobs:
           WorkItemCommand:
             echo $(displayname_comparison_job) ;
             echo Targeting $(targetFlavor) ;
-            chmod +x     $HELIX_WORKITEM_PAYLOAD/corerun;
             mkdir -p     $HELIX_WORKITEM_PAYLOAD/log;
             export CORE_ROOT=$HELIX_WORKITEM_PAYLOAD;
             python3 -u $HELIX_CORRELATION_PAYLOAD/crossgen2_comparison.py crossgen_framework
-            --crossgen    $HELIX_WORKITEM_PAYLOAD/crossgen2/crossgen2.dll
-            --dotnet      $HELIX_WORKITEM_PAYLOAD/corerun
+            --crossgen    $HELIX_WORKITEM_PAYLOAD/crossgen2/crossgen2
             --core_root   $HELIX_WORKITEM_PAYLOAD/prebuiltWork/dlls
             --result_dir  $HELIX_WORKITEM_UPLOAD_ROOT
             --target_os   $(target_crossgen2_os)
@@ -145,8 +143,7 @@ jobs:
             md        %HELIX_WORKITEM_PAYLOAD%\log &
             set CORE_ROOT=%HELIX_WORKITEM_PAYLOAD%&
             python -u %HELIX_CORRELATION_PAYLOAD%\crossgen2_comparison.py crossgen_framework
-            --crossgen    %HELIX_WORKITEM_PAYLOAD%\crossgen2\crossgen2.dll
-            --dotnet      %HELIX_WORKITEM_PAYLOAD%\corerun.exe
+            --crossgen    %HELIX_WORKITEM_PAYLOAD%\crossgen2\crossgen2.exe
             --core_root   %HELIX_WORKITEM_PAYLOAD%\prebuiltWork\dlls
             --result_dir  %HELIX_WORKITEM_UPLOAD_ROOT%
             --target_os   $(target_crossgen2_os)

diff --git a/src/tests/Common/scripts/crossgen2_comparison.py b/src/tests/Common/scripts/crossgen2_comparison.py
@@ -131,7 +131,7 @@ def build_argument_parser():
         collects information about all the runs."""
 
     framework_parser = subparsers.add_parser('crossgen_framework', description=framework_parser_description)
-    framework_parser.add_argument('--dotnet', dest='dotnet', required=True)
+    framework_parser.add_argument('--dotnet', dest='dotnet')
     framework_parser.add_argument('--crossgen', dest='crossgen_executable_filename', required=True)
     framework_parser.add_argument('--target_os', dest='target_os', required=True)
     framework_parser.add_argument('--target_arch', dest='target_arch', required=True)