Fix jit format 3#27

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.

Sign up for GitHub

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

Closed
jashook wants to merge 14 commits into from
Closed

Fix jit format 3 #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3a6925c
WIP: remaining changes to enable CoreCLR PR pipeline in the runtime repo
trylek Nov 11, 2019
1da2ebe
Fix location of empty.csproj in Linux build.sh
trylek Nov 11, 2019
cf32e9e
Fix path to CoreFX.issues.rsp file; hopefully fix Linux builds on ARM
trylek Nov 12, 2019
74ce55b
Two more path fixes
trylek Nov 12, 2019
c2d075a
Various pipeline fixes
trylek Nov 12, 2019
fb555f5
Crossgen comparison & format job fixes
trylek Nov 12, 2019
a414cea
More fixes for the formatting job
trylek Nov 12, 2019
14fb98d
Introduce repo root variable in format.py
trylek Nov 12, 2019
087e8fc
Try to fix Windows Formatting job by fixing slashes in path
trylek Nov 12, 2019
fe7217d
Shorten intermediate paths for two interop test native components
trylek Nov 12, 2019
a84d432
Initial attempt to fix format jobs
Nov 12, 2019
f423e18
Change the cwd to the bootstrap location
Nov 13, 2019
0518f65
Use tempdir for jitutils
Nov 13, 2019
2448f11
Remove funny try logic and rmtree
Nov 13, 2019
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
1 change: 1 addition & 0 deletions NuGet.config
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
<!-- TEST_RESTORE_SOURCES_INSERTION_LINE -->
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
<add key="dotnet-coreclr" value="https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json" />
<add key="myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
<disabledPackageSources>
Expand Down
3 changes: 2 additions & 1 deletion eng/helixcorefxtests.proj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,6 +85,7 @@
TODO: ProjectDir, RootBinDir, TestWorkingDir, and TargetsWindows are global properties set in dir.props, remove the property assignment here when we port to arcade.
-->
<ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory)..\</ProjectDir>
<ProjectDir Condition="Exists('$(ProjectDir).dotnet-runtime-placeholder')">$(ProjectDir)\src\coreclr\</ProjectDir>
<RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)bin\</RootBinDir>
<TestWorkingDir Condition="'$(__TestWorkingDir)'==''">$(RootBinDir)tests\$(__BuildOS).$(__BuildArch).$(__BuildType)\</TestWorkingDir>
<TargetsWindows Condition="'$(__BuildOS)' == 'Windows_NT'">true</TargetsWindows>
Expand DownExpand Up@@ -149,7 +150,7 @@
</PropertyGroup>

<ItemGroup>
<_ProjectsToBuild Include="..\tests\testenvironment.proj">
<_ProjectsToBuild Include="$(ProjectDir)tests\testenvironment.proj">
<Properties>Scenario=$(Scenario);TestEnvFileName=$(TestEnvFilePath);TargetsWindows=$(TargetsWindows)</Properties>
</_ProjectsToBuild>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/coreclr/templates/build-test-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
displayName: Install native dependencies
- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
# Necessary to install correct cmake version
- script: $(coreClrRepoRootDir)eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
- script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
displayName: Install native dependencies


Expand Down
20 changes: 8 additions & 12 deletions eng/pipelines/coreclr/templates/crossgen-comparison-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,14 +40,14 @@ jobs:
value: $(osGroup).$(hostArchType)_$(archType).$(buildConfigUpper)
- ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
- name: binDirectory
value: $(Build.SourcesDirectory)/bin
value: $(coreClrRepoRoot)/bin
- name: productDirectory
value: $(Build.SourcesDirectory)/bin/Product
value: $(binDirectory)/Product
- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
- name: binDirectory
value: $(Build.SourcesDirectory)\bin
value: $(coreClrRepoRoot)\bin
- name: productDirectory
value: $(Build.SourcesDirectory)\bin\Product
value: $(binDirectory\Product

# Test job depends on the corresponding build job
dependsOn: ${{ format('build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
Expand DownExpand Up@@ -83,20 +83,16 @@ jobs:


# Populate Core_Root
- ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
- script: ./build-test.sh $(buildConfig) $(archType) $(crossArg) generatelayoutonly
displayName: Populate Core_Root
- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
- script: build-test.cmd $(buildConfig) $(archType) generateLayoutOnly
displayName: Populate Core_Root
- script: $(coreClrRepoRootDir)build-test$(scriptExt) $(buildConfig) $(archType) $(crossArg) generatelayoutonly
displayName: Populate Core_Root


# Create baseline output on the host (x64) machine
- task: PythonScript@0
displayName: Create cross-platform crossgen baseline
inputs:
scriptSource: 'filePath'
scriptPath: $(Build.SourcesDirectory)/tests/scripts/crossgen_comparison.py
scriptPath: $(coreClrRepoRoot)/tests/scripts/crossgen_comparison.py
${{ if ne(parameters.osGroup, 'Windows_NT') }}:
arguments:
crossgen_framework
Expand DownExpand Up@@ -126,7 +122,7 @@ jobs:
Creator: $(Creator)
WorkItemTimeout: 1:00 # 1 hour
WorkItemDirectory: '$(binDirectory)'
CorrelationPayloadDirectory: '$(Build.SourcesDirectory)/tests/scripts'
CorrelationPayloadDirectory: '$(coreClrRepoRoot)/tests/scripts'
${{ if ne(parameters.osName, 'Windows_NT') }}:
WorkItemCommand:
chmod +x $HELIX_WORKITEM_PAYLOAD/Product/$(targetFlavor)/crossgen;
Expand Down
8 changes: 4 additions & 4 deletions eng/pipelines/coreclr/templates/format-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ parameters:

### Format job
jobs:
- template: xplat-job.yml
- template: xplat-pipeline-job.yml
parameters:
buildConfig: ${{ parameters.buildConfig }}
archType: ${{ parameters.archType }}
Expand All@@ -32,12 +32,12 @@ jobs:
displayName: Run tests/scripts/format.py
inputs:
scriptSource: 'filePath'
scriptPath: $(Build.SourcesDirectory)/tests/scripts/format.py
arguments: '-c $(Build.SourcesDirectory) -o $(osGroup) -a $(archType)'
scriptPath: $(coreClrRepoRoot)/tests/scripts/format.py
arguments: '-c $(coreClrRepoRoot) -o $(osGroup) -a $(archType)'
- task: PublishBuildArtifacts@1
displayName: Publish format.patch
inputs:
PathtoPublish: '$(Build.SourcesDirectory)/format.patch'
PathtoPublish: '$(coreClrRepoRoot)/format.patch'
ArtifactName: format.$(osGroup).$(archType).patch
continueOnError: true
condition: failed()
4 changes: 2 additions & 2 deletions eng/pipelines/coreclr/templates/perf-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,9 +55,9 @@ jobs:

# Create Core_Root
- ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
- script: ./build-test.sh ${{ parameters.buildConfig }} ${{ parameters.archType }} generatelayoutonly
- script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.buildConfig }} ${{ parameters.archType }} generatelayoutonly
displayName: Create Core_Root
- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
# TODO: add generatelayoutonly to build-test.cmd.
- script: build-test.cmd ${{ parameters.buildConfig }} ${{ parameters.archType }} skipmanaged skipnative
- script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.buildConfig }} ${{ parameters.archType }} skipmanaged skipnative
displayName: Create Core_Root
2 changes: 1 addition & 1 deletion eng/pipelines/coreclr/templates/run-test-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -250,7 +250,7 @@ jobs:

# Choose which tests to send to Helix: CoreFX or CoreCLR.
${{ if eq(parameters.corefxTests, true) }}:
helixProjectArguments: '$(coreClrRepoRoot)/eng/helixcorefxtests.proj'
helixProjectArguments: '$(Build.SourcesDirectory)/eng/helixcorefxtests.proj'
${{ if ne(parameters.corefxTests, true) }}:
helixProjectArguments: '$(coreClrRepoRoot)/tests/src/helixpublishwitharcade.proj'

Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/coreclr/templates/xplat-pipeline-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,9 +80,9 @@ jobs:
value: '/'

- name: coreClrRepoRoot
value: '$(Build.SourcesDirectory)/src/coreclr
value: '$(Build.SourcesDirectory)/src/coreclr'

- ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:'
- ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:

- name: coreClrRepoRoot
value: '$(Build.SourcesDirectory)'
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/build-test.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -537,7 +537,7 @@ build_native_projects()
extraCmakeArguments="$extraCmakeArguments -DCLR_CMAKE_ENABLE_CODE_COVERAGE=1"
fi

nextCommand="\"$scriptDir/gen-buildsys.sh\" \"$__TestDir\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $extraCmakeArguments $__cmakeargs"
nextCommand="CONFIG_DIR=\"$__RepoRootDir/eng/common/cross\" \"$scriptDir/gen-buildsys.sh\" \"$__TestDir\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $extraCmakeArguments $__cmakeargs"
echo "Invoking $nextCommand"
eval $nextCommand

Expand Down
9 changes: 5 additions & 4 deletions src/coreclr/build.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,7 @@ build_native()
__versionSourceFile="$intermediatesForBuild/version.c"
if [ $__SkipGenerateVersion == 0 ]; then
pwd
"$__RepoRootDir/eng/common/msbuild.sh" $__ArcadeScriptArgs $__ProjectRoot/eng/empty.csproj \
"$__RepoRootDir/eng/common/msbuild.sh" $__ArcadeScriptArgs $__RepoRootDir/eng/empty.csproj \
/p:NativeVersionFile=$__versionSourceFile \
/t:GenerateNativeVersionFile /restore \
$__CommonMSBuildArgs $__UnprocessedBuildArgs
Expand DownExpand Up@@ -273,8 +273,9 @@ build_native()
extraCmakeArguments="$extraCmakeArguments -DCLR_CMAKE_ENABLE_CODE_COVERAGE=1"
fi

echo "Invoking \"$scriptDir/gen-buildsys.sh\" \"$__ProjectRoot\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $scan_build $extraCmakeArguments $__cmakeargs"
source "$scriptDir/gen-buildsys.sh" "$__ProjectRoot" "$intermediatesForBuild" $platformArch $__BuildType $generator $scan_build "$extraCmakeArguments" "$__cmakeargs"
nextCommand="CONFIG_DIR=\"$__RepoRootDir/eng/common/cross\" \"$scriptDir/gen-buildsys.sh\" \"$__ProjectRoot\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $scan_build $extraCmakeArguments $__cmakeargs"
echo "Invoking $nextCommand"
eval $nextCommand

if [ $? != 0 ]; then
echo "${__ErrMsgPrefix}Failed to generate $message build project!"
Expand DownExpand Up@@ -1063,7 +1064,7 @@ __MsbuildDebugLogsDir="$__LogsDir/MsbuildDebugLogs"
__BinDir="$__RootBinDir/Product/$__BuildOS.$__BuildArch.$__BuildType"
__PackagesBinDir="$__BinDir/.nuget"
export __IntermediatesDir="$__RootBinDir/obj/$__BuildOS.$__BuildArch.$__BuildType"
export __ArtifactsIntermediatesDir="$__ProjectDir/artifacts/obj"
export __ArtifactsIntermediatesDir="$__RepoRootDir/artifacts/obj"
__isMSBuildOnNETCoreSupported=0
__CrossComponentBinDir="$__BinDir"

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Fix jit format 3#27

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.

 Sign up for GitHub

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

 Closed

jashook
wants to merge
14
commits into

from

 Closed


Fix jit format 3
#27
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
3a6925c

WIP: remaining changes to enable CoreCLR PR pipeline in the runtime repo


trylek Nov 11, 2019
1da2ebe

Fix location of empty.csproj in Linux build.sh


trylek Nov 11, 2019
cf32e9e

Fix path to CoreFX.issues.rsp file; hopefully fix Linux builds on ARM


trylek Nov 12, 2019
74ce55b

Two more path fixes


trylek Nov 12, 2019
c2d075a

Various pipeline fixes


trylek Nov 12, 2019
fb555f5

Crossgen comparison & format job fixes


trylek Nov 12, 2019
a414cea

More fixes for the formatting job


trylek Nov 12, 2019
14fb98d

Introduce repo root variable in format.py


trylek Nov 12, 2019
087e8fc

Try to fix Windows Formatting job by fixing slashes in path


trylek Nov 12, 2019
fe7217d

Shorten intermediate paths for two interop test native components


trylek Nov 12, 2019
a84d432

Initial attempt to fix format jobs

Nov 12, 2019
f423e18

Change the cwd to the bootstrap location

Nov 13, 2019
0518f65

Use tempdir for jitutils

Nov 13, 2019
2448f11

Remove funny try logic and rmtree

Nov 13, 2019

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


1 change: 1 addition & 0 deletions
NuGet.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
 <!-- TEST_RESTORE_SOURCES_INSERTION_LINE -->
 <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
 <add key="dotnet-coreclr" value="https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json" />
 <add key="myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
 <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
 </packageSources>
 <disabledPackageSources>
Expand Down

3 changes: 2 additions & 1 deletion
eng/helixcorefxtests.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,6 +85,7 @@
 TODO: ProjectDir, RootBinDir, TestWorkingDir, and TargetsWindows are global properties set in dir.props, remove the property assignment here when we port to arcade.
 -->
 <ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory)..\</ProjectDir>
 <ProjectDir Condition="Exists('$(ProjectDir).dotnet-runtime-placeholder')">$(ProjectDir)\src\coreclr\</ProjectDir>
 <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)bin\</RootBinDir>
 <TestWorkingDir Condition="'$(__TestWorkingDir)'==''">$(RootBinDir)tests\$(__BuildOS).$(__BuildArch).$(__BuildType)\</TestWorkingDir>
 <TargetsWindows Condition="'$(__BuildOS)' == 'Windows_NT'">true</TargetsWindows>
Expand DownExpand Up@@ -149,7 +150,7 @@
 </PropertyGroup>

 <ItemGroup>
 <_ProjectsToBuild Include="..\tests\testenvironment.proj">
 <_ProjectsToBuild Include="$(ProjectDir)tests\testenvironment.proj">
 <Properties>Scenario=$(Scenario);TestEnvFileName=$(TestEnvFilePath);TargetsWindows=$(TargetsWindows)</Properties>
 </_ProjectsToBuild>
 </ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/build-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
 displayName: Install native dependencies
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 # Necessary to install correct cmake version
 - script: $(coreClrRepoRootDir)eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
 - script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
 displayName: Install native dependencies


Expand Down

20 changes: 8 additions & 12 deletions
eng/pipelines/coreclr/templates/crossgen-comparison-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,14 +40,14 @@ jobs:
 value: $(osGroup).$(hostArchType)_$(archType).$(buildConfigUpper)
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - name: binDirectory
 value: $(Build.SourcesDirectory)/bin
 value: $(coreClrRepoRoot)/bin
 - name: productDirectory
 value: $(Build.SourcesDirectory)/bin/Product
 value: $(binDirectory)/Product
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - name: binDirectory
 value: $(Build.SourcesDirectory)\bin
 value: $(coreClrRepoRoot)\bin
 - name: productDirectory
 value: $(Build.SourcesDirectory)\bin\Product
 value: $(binDirectory\Product

 # Test job depends on the corresponding build job
 dependsOn: ${{ format('build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
Expand DownExpand Up@@ -83,20 +83,16 @@ jobs:


 # Populate Core_Root
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - script: ./build-test.sh $(buildConfig) $(archType) $(crossArg) generatelayoutonly
 displayName: Populate Core_Root
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - script: build-test.cmd $(buildConfig) $(archType) generateLayoutOnly
 displayName: Populate Core_Root
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) $(buildConfig) $(archType) $(crossArg) generatelayoutonly
 displayName: Populate Core_Root


 # Create baseline output on the host (x64) machine
 - task: PythonScript@0
 displayName: Create cross-platform crossgen baseline
 inputs:
 scriptSource: 'filePath'
 scriptPath: $(Build.SourcesDirectory)/tests/scripts/crossgen_comparison.py
 scriptPath: $(coreClrRepoRoot)/tests/scripts/crossgen_comparison.py
 ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 arguments:
 crossgen_framework
Expand DownExpand Up@@ -126,7 +122,7 @@ jobs:
 Creator: $(Creator)
 WorkItemTimeout: 1:00 # 1 hour
 WorkItemDirectory: '$(binDirectory)'
 CorrelationPayloadDirectory: '$(Build.SourcesDirectory)/tests/scripts'
 CorrelationPayloadDirectory: '$(coreClrRepoRoot)/tests/scripts'
 ${{ if ne(parameters.osName, 'Windows_NT') }}:
 WorkItemCommand:
 chmod +x $HELIX_WORKITEM_PAYLOAD/Product/$(targetFlavor)/crossgen;
Expand Down

8 changes: 4 additions & 4 deletions
eng/pipelines/coreclr/templates/format-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ parameters:

### Format job
jobs:
- template: xplat-job.yml
- template: xplat-pipeline-job.yml
 parameters:
 buildConfig: ${{ parameters.buildConfig }}
 archType: ${{ parameters.archType }}
Expand All@@ -32,12 +32,12 @@ jobs:
 displayName: Run tests/scripts/format.py
 inputs:
 scriptSource: 'filePath'
 scriptPath: $(Build.SourcesDirectory)/tests/scripts/format.py
 arguments: '-c $(Build.SourcesDirectory) -o $(osGroup) -a $(archType)'
 scriptPath: $(coreClrRepoRoot)/tests/scripts/format.py
 arguments: '-c $(coreClrRepoRoot) -o $(osGroup) -a $(archType)'
 - task: PublishBuildArtifacts@1
 displayName: Publish format.patch
 inputs:
 PathtoPublish: '$(Build.SourcesDirectory)/format.patch'
 PathtoPublish: '$(coreClrRepoRoot)/format.patch'
 ArtifactName: format.$(osGroup).$(archType).patch
 continueOnError: true
 condition: failed()

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/perf-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,9 +55,9 @@ jobs:

 # Create Core_Root
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - script: ./build-test.sh ${{ parameters.buildConfig }} ${{ parameters.archType }} generatelayoutonly
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.buildConfig }} ${{ parameters.archType }} generatelayoutonly
 displayName: Create Core_Root
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 # TODO: add generatelayoutonly to build-test.cmd.
 - script: build-test.cmd ${{ parameters.buildConfig }} ${{ parameters.archType }} skipmanaged skipnative
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.buildConfig }} ${{ parameters.archType }} skipmanaged skipnative
 displayName: Create Core_Root

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/run-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,7 +250,7 @@ jobs:

 # Choose which tests to send to Helix: CoreFX or CoreCLR.
 ${{ if eq(parameters.corefxTests, true) }}:
 helixProjectArguments: '$(coreClrRepoRoot)/eng/helixcorefxtests.proj'
 helixProjectArguments: '$(Build.SourcesDirectory)/eng/helixcorefxtests.proj'
 ${{ if ne(parameters.corefxTests, true) }}:
 helixProjectArguments: '$(coreClrRepoRoot)/tests/src/helixpublishwitharcade.proj'

Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/xplat-pipeline-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,9 +80,9 @@ jobs:
 value: '/'

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)/src/coreclr
 value: '$(Build.SourcesDirectory)/src/coreclr'

 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:'
 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)'
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/build-test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -537,7 +537,7 @@ build_native_projects()
 extraCmakeArguments="$extraCmakeArguments -DCLR_CMAKE_ENABLE_CODE_COVERAGE=1"
 fi

 nextCommand="\"$scriptDir/gen-buildsys.sh\" \"$__TestDir\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $extraCmakeArguments $__cmakeargs"
 nextCommand="CONFIG_DIR=\"$__RepoRootDir/eng/common/cross\" \"$scriptDir/gen-buildsys.sh\" \"$__TestDir\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $extraCmakeArguments $__cmakeargs"
 echo "Invoking $nextCommand"
 eval $nextCommand

Expand Down

9 changes: 5 additions & 4 deletions
src/coreclr/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,7 @@ build_native()
 __versionSourceFile="$intermediatesForBuild/version.c"
 if [ $__SkipGenerateVersion == 0 ]; then
 pwd
 "$__RepoRootDir/eng/common/msbuild.sh" $__ArcadeScriptArgs $__ProjectRoot/eng/empty.csproj \
 "$__RepoRootDir/eng/common/msbuild.sh" $__ArcadeScriptArgs $__RepoRootDir/eng/empty.csproj \
 /p:NativeVersionFile=$__versionSourceFile \
 /t:GenerateNativeVersionFile /restore \
 $__CommonMSBuildArgs $__UnprocessedBuildArgs
Expand DownExpand Up@@ -273,8 +273,9 @@ build_native()
 extraCmakeArguments="$extraCmakeArguments -DCLR_CMAKE_ENABLE_CODE_COVERAGE=1"
 fi

 echo "Invoking \"$scriptDir/gen-buildsys.sh\" \"$__ProjectRoot\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $scan_build $extraCmakeArguments $__cmakeargs"
 source "$scriptDir/gen-buildsys.sh" "$__ProjectRoot" "$intermediatesForBuild" $platformArch $__BuildType $generator $scan_build "$extraCmakeArguments" "$__cmakeargs"
 nextCommand="CONFIG_DIR=\"$__RepoRootDir/eng/common/cross\" \"$scriptDir/gen-buildsys.sh\" \"$__ProjectRoot\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $scan_build $extraCmakeArguments $__cmakeargs"
 echo "Invoking $nextCommand"
 eval $nextCommand

 if [ $? != 0 ]; then
 echo "${__ErrMsgPrefix}Failed to generate $message build project!"
Expand DownExpand Up@@ -1063,7 +1064,7 @@ __MsbuildDebugLogsDir="$__LogsDir/MsbuildDebugLogs"
__BinDir="$__RootBinDir/Product/$__BuildOS.$__BuildArch.$__BuildType"
__PackagesBinDir="$__BinDir/.nuget"
export __IntermediatesDir="$__RootBinDir/obj/$__BuildOS.$__BuildArch.$__BuildType"
export __ArtifactsIntermediatesDir="$__ProjectDir/artifacts/obj"
export __ArtifactsIntermediatesDir="$__RepoRootDir/artifacts/obj"
__isMSBuildOnNETCoreSupported=0
__CrossComponentBinDir="$__BinDir"

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix jit format 3#27

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.

 Sign up for GitHub

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

 Closed

jashook
wants to merge
14
commits into

from

 Closed


Fix jit format 3
#27
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
3a6925c

WIP: remaining changes to enable CoreCLR PR pipeline in the runtime repo


trylek Nov 11, 2019
1da2ebe

Fix location of empty.csproj in Linux build.sh


trylek Nov 11, 2019
cf32e9e

Fix path to CoreFX.issues.rsp file; hopefully fix Linux builds on ARM


trylek Nov 12, 2019
74ce55b

Two more path fixes


trylek Nov 12, 2019
c2d075a

Various pipeline fixes


trylek Nov 12, 2019
fb555f5

Crossgen comparison & format job fixes


trylek Nov 12, 2019
a414cea

More fixes for the formatting job


trylek Nov 12, 2019
14fb98d

Introduce repo root variable in format.py


trylek Nov 12, 2019
087e8fc

Try to fix Windows Formatting job by fixing slashes in path


trylek Nov 12, 2019
fe7217d

Shorten intermediate paths for two interop test native components


trylek Nov 12, 2019
a84d432

Initial attempt to fix format jobs

Nov 12, 2019
f423e18

Change the cwd to the bootstrap location

Nov 13, 2019
0518f65

Use tempdir for jitutils

Nov 13, 2019
2448f11

Remove funny try logic and rmtree

Nov 13, 2019

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


1 change: 1 addition & 0 deletions
NuGet.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
 <!-- TEST_RESTORE_SOURCES_INSERTION_LINE -->
 <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
 <add key="dotnet-coreclr" value="https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json" />
 <add key="myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
 <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
 </packageSources>
 <disabledPackageSources>
Expand Down

3 changes: 2 additions & 1 deletion
eng/helixcorefxtests.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,6 +85,7 @@
 TODO: ProjectDir, RootBinDir, TestWorkingDir, and TargetsWindows are global properties set in dir.props, remove the property assignment here when we port to arcade.
 -->
 <ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory)..\</ProjectDir>
 <ProjectDir Condition="Exists('$(ProjectDir).dotnet-runtime-placeholder')">$(ProjectDir)\src\coreclr\</ProjectDir>
 <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)bin\</RootBinDir>
 <TestWorkingDir Condition="'$(__TestWorkingDir)'==''">$(RootBinDir)tests\$(__BuildOS).$(__BuildArch).$(__BuildType)\</TestWorkingDir>
 <TargetsWindows Condition="'$(__BuildOS)' == 'Windows_NT'">true</TargetsWindows>
Expand DownExpand Up@@ -149,7 +150,7 @@
 </PropertyGroup>

 <ItemGroup>
 <_ProjectsToBuild Include="..\tests\testenvironment.proj">
 <_ProjectsToBuild Include="$(ProjectDir)tests\testenvironment.proj">
 <Properties>Scenario=$(Scenario);TestEnvFileName=$(TestEnvFilePath);TargetsWindows=$(TargetsWindows)</Properties>
 </_ProjectsToBuild>
 </ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/build-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
 displayName: Install native dependencies
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 # Necessary to install correct cmake version
 - script: $(coreClrRepoRootDir)eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
 - script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
 displayName: Install native dependencies


Expand Down

20 changes: 8 additions & 12 deletions
eng/pipelines/coreclr/templates/crossgen-comparison-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,14 +40,14 @@ jobs:
 value: $(osGroup).$(hostArchType)_$(archType).$(buildConfigUpper)
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - name: binDirectory
 value: $(Build.SourcesDirectory)/bin
 value: $(coreClrRepoRoot)/bin
 - name: productDirectory
 value: $(Build.SourcesDirectory)/bin/Product
 value: $(binDirectory)/Product
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - name: binDirectory
 value: $(Build.SourcesDirectory)\bin
 value: $(coreClrRepoRoot)\bin
 - name: productDirectory
 value: $(Build.SourcesDirectory)\bin\Product
 value: $(binDirectory\Product

 # Test job depends on the corresponding build job
 dependsOn: ${{ format('build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
Expand DownExpand Up@@ -83,20 +83,16 @@ jobs:


 # Populate Core_Root
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - script: ./build-test.sh $(buildConfig) $(archType) $(crossArg) generatelayoutonly
 displayName: Populate Core_Root
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - script: build-test.cmd $(buildConfig) $(archType) generateLayoutOnly
 displayName: Populate Core_Root
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) $(buildConfig) $(archType) $(crossArg) generatelayoutonly
 displayName: Populate Core_Root


 # Create baseline output on the host (x64) machine
 - task: PythonScript@0
 displayName: Create cross-platform crossgen baseline
 inputs:
 scriptSource: 'filePath'
 scriptPath: $(Build.SourcesDirectory)/tests/scripts/crossgen_comparison.py
 scriptPath: $(coreClrRepoRoot)/tests/scripts/crossgen_comparison.py
 ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 arguments:
 crossgen_framework
Expand DownExpand Up@@ -126,7 +122,7 @@ jobs:
 Creator: $(Creator)
 WorkItemTimeout: 1:00 # 1 hour
 WorkItemDirectory: '$(binDirectory)'
 CorrelationPayloadDirectory: '$(Build.SourcesDirectory)/tests/scripts'
 CorrelationPayloadDirectory: '$(coreClrRepoRoot)/tests/scripts'
 ${{ if ne(parameters.osName, 'Windows_NT') }}:
 WorkItemCommand:
 chmod +x $HELIX_WORKITEM_PAYLOAD/Product/$(targetFlavor)/crossgen;
Expand Down

8 changes: 4 additions & 4 deletions
eng/pipelines/coreclr/templates/format-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ parameters:

### Format job
jobs:
- template: xplat-job.yml
- template: xplat-pipeline-job.yml
 parameters:
 buildConfig: ${{ parameters.buildConfig }}
 archType: ${{ parameters.archType }}
Expand All@@ -32,12 +32,12 @@ jobs:
 displayName: Run tests/scripts/format.py
 inputs:
 scriptSource: 'filePath'
 scriptPath: $(Build.SourcesDirectory)/tests/scripts/format.py
 arguments: '-c $(Build.SourcesDirectory) -o $(osGroup) -a $(archType)'
 scriptPath: $(coreClrRepoRoot)/tests/scripts/format.py
 arguments: '-c $(coreClrRepoRoot) -o $(osGroup) -a $(archType)'
 - task: PublishBuildArtifacts@1
 displayName: Publish format.patch
 inputs:
 PathtoPublish: '$(Build.SourcesDirectory)/format.patch'
 PathtoPublish: '$(coreClrRepoRoot)/format.patch'
 ArtifactName: format.$(osGroup).$(archType).patch
 continueOnError: true
 condition: failed()

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/perf-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,9 +55,9 @@ jobs:

 # Create Core_Root
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - script: ./build-test.sh ${{ parameters.buildConfig }} ${{ parameters.archType }} generatelayoutonly
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.buildConfig }} ${{ parameters.archType }} generatelayoutonly
 displayName: Create Core_Root
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 # TODO: add generatelayoutonly to build-test.cmd.
 - script: build-test.cmd ${{ parameters.buildConfig }} ${{ parameters.archType }} skipmanaged skipnative
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.buildConfig }} ${{ parameters.archType }} skipmanaged skipnative
 displayName: Create Core_Root

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/run-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,7 +250,7 @@ jobs:

 # Choose which tests to send to Helix: CoreFX or CoreCLR.
 ${{ if eq(parameters.corefxTests, true) }}:
 helixProjectArguments: '$(coreClrRepoRoot)/eng/helixcorefxtests.proj'
 helixProjectArguments: '$(Build.SourcesDirectory)/eng/helixcorefxtests.proj'
 ${{ if ne(parameters.corefxTests, true) }}:
 helixProjectArguments: '$(coreClrRepoRoot)/tests/src/helixpublishwitharcade.proj'

Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/xplat-pipeline-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,9 +80,9 @@ jobs:
 value: '/'

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)/src/coreclr
 value: '$(Build.SourcesDirectory)/src/coreclr'

 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:'
 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)'
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/build-test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -537,7 +537,7 @@ build_native_projects()
 extraCmakeArguments="$extraCmakeArguments -DCLR_CMAKE_ENABLE_CODE_COVERAGE=1"
 fi

 nextCommand="\"$scriptDir/gen-buildsys.sh\" \"$__TestDir\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $extraCmakeArguments $__cmakeargs"
 nextCommand="CONFIG_DIR=\"$__RepoRootDir/eng/common/cross\" \"$scriptDir/gen-buildsys.sh\" \"$__TestDir\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $extraCmakeArguments $__cmakeargs"
 echo "Invoking $nextCommand"
 eval $nextCommand

Expand Down

9 changes: 5 additions & 4 deletions
src/coreclr/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,7 @@ build_native()
 __versionSourceFile="$intermediatesForBuild/version.c"
 if [ $__SkipGenerateVersion == 0 ]; then
 pwd
 "$__RepoRootDir/eng/common/msbuild.sh" $__ArcadeScriptArgs $__ProjectRoot/eng/empty.csproj \
 "$__RepoRootDir/eng/common/msbuild.sh" $__ArcadeScriptArgs $__RepoRootDir/eng/empty.csproj \
 /p:NativeVersionFile=$__versionSourceFile \
 /t:GenerateNativeVersionFile /restore \
 $__CommonMSBuildArgs $__UnprocessedBuildArgs
Expand DownExpand Up@@ -273,8 +273,9 @@ build_native()
 extraCmakeArguments="$extraCmakeArguments -DCLR_CMAKE_ENABLE_CODE_COVERAGE=1"
 fi

 echo "Invoking \"$scriptDir/gen-buildsys.sh\" \"$__ProjectRoot\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $scan_build $extraCmakeArguments $__cmakeargs"
 source "$scriptDir/gen-buildsys.sh" "$__ProjectRoot" "$intermediatesForBuild" $platformArch $__BuildType $generator $scan_build "$extraCmakeArguments" "$__cmakeargs"
 nextCommand="CONFIG_DIR=\"$__RepoRootDir/eng/common/cross\" \"$scriptDir/gen-buildsys.sh\" \"$__ProjectRoot\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $scan_build $extraCmakeArguments $__cmakeargs"
 echo "Invoking $nextCommand"
 eval $nextCommand

 if [ $? != 0 ]; then
 echo "${__ErrMsgPrefix}Failed to generate $message build project!"
Expand DownExpand Up@@ -1063,7 +1064,7 @@ __MsbuildDebugLogsDir="$__LogsDir/MsbuildDebugLogs"
__BinDir="$__RootBinDir/Product/$__BuildOS.$__BuildArch.$__BuildType"
__PackagesBinDir="$__BinDir/.nuget"
export __IntermediatesDir="$__RootBinDir/obj/$__BuildOS.$__BuildArch.$__BuildType"
export __ArtifactsIntermediatesDir="$__ProjectDir/artifacts/obj"
export __ArtifactsIntermediatesDir="$__RepoRootDir/artifacts/obj"
__isMSBuildOnNETCoreSupported=0
__CrossComponentBinDir="$__BinDir"

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix jit format 3#27

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.

 Sign up for GitHub

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

 Closed

jashook
wants to merge
14
commits into

from

 Closed


Fix jit format 3
#27
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
3a6925c

WIP: remaining changes to enable CoreCLR PR pipeline in the runtime repo


trylek Nov 11, 2019
1da2ebe

Fix location of empty.csproj in Linux build.sh


trylek Nov 11, 2019
cf32e9e

Fix path to CoreFX.issues.rsp file; hopefully fix Linux builds on ARM


trylek Nov 12, 2019
74ce55b

Two more path fixes


trylek Nov 12, 2019
c2d075a

Various pipeline fixes


trylek Nov 12, 2019
fb555f5

Crossgen comparison & format job fixes


trylek Nov 12, 2019
a414cea

More fixes for the formatting job


trylek Nov 12, 2019
14fb98d

Introduce repo root variable in format.py


trylek Nov 12, 2019
087e8fc

Try to fix Windows Formatting job by fixing slashes in path


trylek Nov 12, 2019
fe7217d

Shorten intermediate paths for two interop test native components


trylek Nov 12, 2019
a84d432

Initial attempt to fix format jobs

Nov 12, 2019
f423e18

Change the cwd to the bootstrap location

Nov 13, 2019
0518f65

Use tempdir for jitutils

Nov 13, 2019
2448f11

Remove funny try logic and rmtree

Nov 13, 2019

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


1 change: 1 addition & 0 deletions
NuGet.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
 <!-- TEST_RESTORE_SOURCES_INSERTION_LINE -->
 <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
 <add key="dotnet-coreclr" value="https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json" />
 <add key="myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
 <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
 </packageSources>
 <disabledPackageSources>
Expand Down

3 changes: 2 additions & 1 deletion
eng/helixcorefxtests.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,6 +85,7 @@
 TODO: ProjectDir, RootBinDir, TestWorkingDir, and TargetsWindows are global properties set in dir.props, remove the property assignment here when we port to arcade.
 -->
 <ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory)..\</ProjectDir>
 <ProjectDir Condition="Exists('$(ProjectDir).dotnet-runtime-placeholder')">$(ProjectDir)\src\coreclr\</ProjectDir>
 <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)bin\</RootBinDir>
 <TestWorkingDir Condition="'$(__TestWorkingDir)'==''">$(RootBinDir)tests\$(__BuildOS).$(__BuildArch).$(__BuildType)\</TestWorkingDir>
 <TargetsWindows Condition="'$(__BuildOS)' == 'Windows_NT'">true</TargetsWindows>
Expand DownExpand Up@@ -149,7 +150,7 @@
 </PropertyGroup>

 <ItemGroup>
 <_ProjectsToBuild Include="..\tests\testenvironment.proj">
 <_ProjectsToBuild Include="$(ProjectDir)tests\testenvironment.proj">
 <Properties>Scenario=$(Scenario);TestEnvFileName=$(TestEnvFilePath);TargetsWindows=$(TargetsWindows)</Properties>
 </_ProjectsToBuild>
 </ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/build-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
 displayName: Install native dependencies
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 # Necessary to install correct cmake version
 - script: $(coreClrRepoRootDir)eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
 - script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
 displayName: Install native dependencies


Expand Down

20 changes: 8 additions & 12 deletions
eng/pipelines/coreclr/templates/crossgen-comparison-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,14 +40,14 @@ jobs:
 value: $(osGroup).$(hostArchType)_$(archType).$(buildConfigUpper)
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - name: binDirectory
 value: $(Build.SourcesDirectory)/bin
 value: $(coreClrRepoRoot)/bin
 - name: productDirectory
 value: $(Build.SourcesDirectory)/bin/Product
 value: $(binDirectory)/Product
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - name: binDirectory
 value: $(Build.SourcesDirectory)\bin
 value: $(coreClrRepoRoot)\bin
 - name: productDirectory
 value: $(Build.SourcesDirectory)\bin\Product
 value: $(binDirectory\Product

 # Test job depends on the corresponding build job
 dependsOn: ${{ format('build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
Expand DownExpand Up@@ -83,20 +83,16 @@ jobs:


 # Populate Core_Root
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - script: ./build-test.sh $(buildConfig) $(archType) $(crossArg) generatelayoutonly
 displayName: Populate Core_Root
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - script: build-test.cmd $(buildConfig) $(archType) generateLayoutOnly
 displayName: Populate Core_Root
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) $(buildConfig) $(archType) $(crossArg) generatelayoutonly
 displayName: Populate Core_Root


 # Create baseline output on the host (x64) machine
 - task: PythonScript@0
 displayName: Create cross-platform crossgen baseline
 inputs:
 scriptSource: 'filePath'
 scriptPath: $(Build.SourcesDirectory)/tests/scripts/crossgen_comparison.py
 scriptPath: $(coreClrRepoRoot)/tests/scripts/crossgen_comparison.py
 ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 arguments:
 crossgen_framework
Expand DownExpand Up@@ -126,7 +122,7 @@ jobs:
 Creator: $(Creator)
 WorkItemTimeout: 1:00 # 1 hour
 WorkItemDirectory: '$(binDirectory)'
 CorrelationPayloadDirectory: '$(Build.SourcesDirectory)/tests/scripts'
 CorrelationPayloadDirectory: '$(coreClrRepoRoot)/tests/scripts'
 ${{ if ne(parameters.osName, 'Windows_NT') }}:
 WorkItemCommand:
 chmod +x $HELIX_WORKITEM_PAYLOAD/Product/$(targetFlavor)/crossgen;
Expand Down

8 changes: 4 additions & 4 deletions
eng/pipelines/coreclr/templates/format-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ parameters:

### Format job
jobs:
- template: xplat-job.yml
- template: xplat-pipeline-job.yml
 parameters:
 buildConfig: ${{ parameters.buildConfig }}
 archType: ${{ parameters.archType }}
Expand All@@ -32,12 +32,12 @@ jobs:
 displayName: Run tests/scripts/format.py
 inputs:
 scriptSource: 'filePath'
 scriptPath: $(Build.SourcesDirectory)/tests/scripts/format.py
 arguments: '-c $(Build.SourcesDirectory) -o $(osGroup) -a $(archType)'
 scriptPath: $(coreClrRepoRoot)/tests/scripts/format.py
 arguments: '-c $(coreClrRepoRoot) -o $(osGroup) -a $(archType)'
 - task: PublishBuildArtifacts@1
 displayName: Publish format.patch
 inputs:
 PathtoPublish: '$(Build.SourcesDirectory)/format.patch'
 PathtoPublish: '$(coreClrRepoRoot)/format.patch'
 ArtifactName: format.$(osGroup).$(archType).patch
 continueOnError: true
 condition: failed()

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/perf-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,9 +55,9 @@ jobs:

 # Create Core_Root
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - script: ./build-test.sh ${{ parameters.buildConfig }} ${{ parameters.archType }} generatelayoutonly
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.buildConfig }} ${{ parameters.archType }} generatelayoutonly
 displayName: Create Core_Root
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 # TODO: add generatelayoutonly to build-test.cmd.
 - script: build-test.cmd ${{ parameters.buildConfig }} ${{ parameters.archType }} skipmanaged skipnative
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.buildConfig }} ${{ parameters.archType }} skipmanaged skipnative
 displayName: Create Core_Root

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/run-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,7 +250,7 @@ jobs:

 # Choose which tests to send to Helix: CoreFX or CoreCLR.
 ${{ if eq(parameters.corefxTests, true) }}:
 helixProjectArguments: '$(coreClrRepoRoot)/eng/helixcorefxtests.proj'
 helixProjectArguments: '$(Build.SourcesDirectory)/eng/helixcorefxtests.proj'
 ${{ if ne(parameters.corefxTests, true) }}:
 helixProjectArguments: '$(coreClrRepoRoot)/tests/src/helixpublishwitharcade.proj'

Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/xplat-pipeline-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,9 +80,9 @@ jobs:
 value: '/'

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)/src/coreclr
 value: '$(Build.SourcesDirectory)/src/coreclr'

 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:'
 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)'
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/build-test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -537,7 +537,7 @@ build_native_projects()
 extraCmakeArguments="$extraCmakeArguments -DCLR_CMAKE_ENABLE_CODE_COVERAGE=1"
 fi

 nextCommand="\"$scriptDir/gen-buildsys.sh\" \"$__TestDir\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $extraCmakeArguments $__cmakeargs"
 nextCommand="CONFIG_DIR=\"$__RepoRootDir/eng/common/cross\" \"$scriptDir/gen-buildsys.sh\" \"$__TestDir\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $extraCmakeArguments $__cmakeargs"
 echo "Invoking $nextCommand"
 eval $nextCommand

Expand Down

9 changes: 5 additions & 4 deletions
src/coreclr/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,7 @@ build_native()
 __versionSourceFile="$intermediatesForBuild/version.c"
 if [ $__SkipGenerateVersion == 0 ]; then
 pwd
 "$__RepoRootDir/eng/common/msbuild.sh" $__ArcadeScriptArgs $__ProjectRoot/eng/empty.csproj \
 "$__RepoRootDir/eng/common/msbuild.sh" $__ArcadeScriptArgs $__RepoRootDir/eng/empty.csproj \
 /p:NativeVersionFile=$__versionSourceFile \
 /t:GenerateNativeVersionFile /restore \
 $__CommonMSBuildArgs $__UnprocessedBuildArgs
Expand DownExpand Up@@ -273,8 +273,9 @@ build_native()
 extraCmakeArguments="$extraCmakeArguments -DCLR_CMAKE_ENABLE_CODE_COVERAGE=1"
 fi

 echo "Invoking \"$scriptDir/gen-buildsys.sh\" \"$__ProjectRoot\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $scan_build $extraCmakeArguments $__cmakeargs"
 source "$scriptDir/gen-buildsys.sh" "$__ProjectRoot" "$intermediatesForBuild" $platformArch $__BuildType $generator $scan_build "$extraCmakeArguments" "$__cmakeargs"
 nextCommand="CONFIG_DIR=\"$__RepoRootDir/eng/common/cross\" \"$scriptDir/gen-buildsys.sh\" \"$__ProjectRoot\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $scan_build $extraCmakeArguments $__cmakeargs"
 echo "Invoking $nextCommand"
 eval $nextCommand

 if [ $? != 0 ]; then
 echo "${__ErrMsgPrefix}Failed to generate $message build project!"
Expand DownExpand Up@@ -1063,7 +1064,7 @@ __MsbuildDebugLogsDir="$__LogsDir/MsbuildDebugLogs"
__BinDir="$__RootBinDir/Product/$__BuildOS.$__BuildArch.$__BuildType"
__PackagesBinDir="$__BinDir/.nuget"
export __IntermediatesDir="$__RootBinDir/obj/$__BuildOS.$__BuildArch.$__BuildType"
export __ArtifactsIntermediatesDir="$__ProjectDir/artifacts/obj"
export __ArtifactsIntermediatesDir="$__RepoRootDir/artifacts/obj"
__isMSBuildOnNETCoreSupported=0
__CrossComponentBinDir="$__BinDir"

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Fix jit format 3#27

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.

 Sign up for GitHub

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

 Closed

jashook
wants to merge
14
commits into

from

 Closed


Fix jit format 3
#27
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
3a6925c

WIP: remaining changes to enable CoreCLR PR pipeline in the runtime repo


trylek Nov 11, 2019
1da2ebe

Fix location of empty.csproj in Linux build.sh


trylek Nov 11, 2019
cf32e9e

Fix path to CoreFX.issues.rsp file; hopefully fix Linux builds on ARM


trylek Nov 12, 2019
74ce55b

Two more path fixes


trylek Nov 12, 2019
c2d075a

Various pipeline fixes


trylek Nov 12, 2019
fb555f5

Crossgen comparison & format job fixes


trylek Nov 12, 2019
a414cea

More fixes for the formatting job


trylek Nov 12, 2019
14fb98d

Introduce repo root variable in format.py


trylek Nov 12, 2019
087e8fc

Try to fix Windows Formatting job by fixing slashes in path


trylek Nov 12, 2019
fe7217d

Shorten intermediate paths for two interop test native components


trylek Nov 12, 2019
a84d432

Initial attempt to fix format jobs

Nov 12, 2019
f423e18

Change the cwd to the bootstrap location

Nov 13, 2019
0518f65

Use tempdir for jitutils

Nov 13, 2019
2448f11

Remove funny try logic and rmtree

Nov 13, 2019

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


1 change: 1 addition & 0 deletions
NuGet.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
 <!-- TEST_RESTORE_SOURCES_INSERTION_LINE -->
 <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
 <add key="dotnet-coreclr" value="https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json" />
 <add key="myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
 <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
 </packageSources>
 <disabledPackageSources>
Expand Down

3 changes: 2 additions & 1 deletion
eng/helixcorefxtests.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,6 +85,7 @@
 TODO: ProjectDir, RootBinDir, TestWorkingDir, and TargetsWindows are global properties set in dir.props, remove the property assignment here when we port to arcade.
 -->
 <ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory)..\</ProjectDir>
 <ProjectDir Condition="Exists('$(ProjectDir).dotnet-runtime-placeholder')">$(ProjectDir)\src\coreclr\</ProjectDir>
 <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)bin\</RootBinDir>
 <TestWorkingDir Condition="'$(__TestWorkingDir)'==''">$(RootBinDir)tests\$(__BuildOS).$(__BuildArch).$(__BuildType)\</TestWorkingDir>
 <TargetsWindows Condition="'$(__BuildOS)' == 'Windows_NT'">true</TargetsWindows>
Expand DownExpand Up@@ -149,7 +150,7 @@
 </PropertyGroup>

 <ItemGroup>
 <_ProjectsToBuild Include="..\tests\testenvironment.proj">
 <_ProjectsToBuild Include="$(ProjectDir)tests\testenvironment.proj">
 <Properties>Scenario=$(Scenario);TestEnvFileName=$(TestEnvFilePath);TargetsWindows=$(TargetsWindows)</Properties>
 </_ProjectsToBuild>
 </ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/build-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
 displayName: Install native dependencies
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 # Necessary to install correct cmake version
 - script: $(coreClrRepoRootDir)eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
 - script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
 displayName: Install native dependencies


Expand Down

20 changes: 8 additions & 12 deletions
eng/pipelines/coreclr/templates/crossgen-comparison-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,14 +40,14 @@ jobs:
 value: $(osGroup).$(hostArchType)_$(archType).$(buildConfigUpper)
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - name: binDirectory
 value: $(Build.SourcesDirectory)/bin
 value: $(coreClrRepoRoot)/bin
 - name: productDirectory
 value: $(Build.SourcesDirectory)/bin/Product
 value: $(binDirectory)/Product
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - name: binDirectory
 value: $(Build.SourcesDirectory)\bin
 value: $(coreClrRepoRoot)\bin
 - name: productDirectory
 value: $(Build.SourcesDirectory)\bin\Product
 value: $(binDirectory\Product

 # Test job depends on the corresponding build job
 dependsOn: ${{ format('build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
Expand DownExpand Up@@ -83,20 +83,16 @@ jobs:


 # Populate Core_Root
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - script: ./build-test.sh $(buildConfig) $(archType) $(crossArg) generatelayoutonly
 displayName: Populate Core_Root
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - script: build-test.cmd $(buildConfig) $(archType) generateLayoutOnly
 displayName: Populate Core_Root
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) $(buildConfig) $(archType) $(crossArg) generatelayoutonly
 displayName: Populate Core_Root


 # Create baseline output on the host (x64) machine
 - task: PythonScript@0
 displayName: Create cross-platform crossgen baseline
 inputs:
 scriptSource: 'filePath'
 scriptPath: $(Build.SourcesDirectory)/tests/scripts/crossgen_comparison.py
 scriptPath: $(coreClrRepoRoot)/tests/scripts/crossgen_comparison.py
 ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 arguments:
 crossgen_framework
Expand DownExpand Up@@ -126,7 +122,7 @@ jobs:
 Creator: $(Creator)
 WorkItemTimeout: 1:00 # 1 hour
 WorkItemDirectory: '$(binDirectory)'
 CorrelationPayloadDirectory: '$(Build.SourcesDirectory)/tests/scripts'
 CorrelationPayloadDirectory: '$(coreClrRepoRoot)/tests/scripts'
 ${{ if ne(parameters.osName, 'Windows_NT') }}:
 WorkItemCommand:
 chmod +x $HELIX_WORKITEM_PAYLOAD/Product/$(targetFlavor)/crossgen;
Expand Down

8 changes: 4 additions & 4 deletions
eng/pipelines/coreclr/templates/format-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ parameters:

### Format job
jobs:
- template: xplat-job.yml
- template: xplat-pipeline-job.yml
 parameters:
 buildConfig: ${{ parameters.buildConfig }}
 archType: ${{ parameters.archType }}
Expand All@@ -32,12 +32,12 @@ jobs:
 displayName: Run tests/scripts/format.py
 inputs:
 scriptSource: 'filePath'
 scriptPath: $(Build.SourcesDirectory)/tests/scripts/format.py
 arguments: '-c $(Build.SourcesDirectory) -o $(osGroup) -a $(archType)'
 scriptPath: $(coreClrRepoRoot)/tests/scripts/format.py
 arguments: '-c $(coreClrRepoRoot) -o $(osGroup) -a $(archType)'
 - task: PublishBuildArtifacts@1
 displayName: Publish format.patch
 inputs:
 PathtoPublish: '$(Build.SourcesDirectory)/format.patch'
 PathtoPublish: '$(coreClrRepoRoot)/format.patch'
 ArtifactName: format.$(osGroup).$(archType).patch
 continueOnError: true
 condition: failed()

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/perf-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,9 +55,9 @@ jobs:

 # Create Core_Root
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - script: ./build-test.sh ${{ parameters.buildConfig }} ${{ parameters.archType }} generatelayoutonly
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.buildConfig }} ${{ parameters.archType }} generatelayoutonly
 displayName: Create Core_Root
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 # TODO: add generatelayoutonly to build-test.cmd.
 - script: build-test.cmd ${{ parameters.buildConfig }} ${{ parameters.archType }} skipmanaged skipnative
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.buildConfig }} ${{ parameters.archType }} skipmanaged skipnative
 displayName: Create Core_Root

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/run-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,7 +250,7 @@ jobs:

 # Choose which tests to send to Helix: CoreFX or CoreCLR.
 ${{ if eq(parameters.corefxTests, true) }}:
 helixProjectArguments: '$(coreClrRepoRoot)/eng/helixcorefxtests.proj'
 helixProjectArguments: '$(Build.SourcesDirectory)/eng/helixcorefxtests.proj'
 ${{ if ne(parameters.corefxTests, true) }}:
 helixProjectArguments: '$(coreClrRepoRoot)/tests/src/helixpublishwitharcade.proj'

Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/xplat-pipeline-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,9 +80,9 @@ jobs:
 value: '/'

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)/src/coreclr
 value: '$(Build.SourcesDirectory)/src/coreclr'

 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:'
 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)'
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/build-test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -537,7 +537,7 @@ build_native_projects()
 extraCmakeArguments="$extraCmakeArguments -DCLR_CMAKE_ENABLE_CODE_COVERAGE=1"
 fi

 nextCommand="\"$scriptDir/gen-buildsys.sh\" \"$__TestDir\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $extraCmakeArguments $__cmakeargs"
 nextCommand="CONFIG_DIR=\"$__RepoRootDir/eng/common/cross\" \"$scriptDir/gen-buildsys.sh\" \"$__TestDir\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $extraCmakeArguments $__cmakeargs"
 echo "Invoking $nextCommand"
 eval $nextCommand

Expand Down

9 changes: 5 additions & 4 deletions
src/coreclr/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,7 @@ build_native()
 __versionSourceFile="$intermediatesForBuild/version.c"
 if [ $__SkipGenerateVersion == 0 ]; then
 pwd
 "$__RepoRootDir/eng/common/msbuild.sh" $__ArcadeScriptArgs $__ProjectRoot/eng/empty.csproj \
 "$__RepoRootDir/eng/common/msbuild.sh" $__ArcadeScriptArgs $__RepoRootDir/eng/empty.csproj \
 /p:NativeVersionFile=$__versionSourceFile \
 /t:GenerateNativeVersionFile /restore \
 $__CommonMSBuildArgs $__UnprocessedBuildArgs
Expand DownExpand Up@@ -273,8 +273,9 @@ build_native()
 extraCmakeArguments="$extraCmakeArguments -DCLR_CMAKE_ENABLE_CODE_COVERAGE=1"
 fi

 echo "Invoking \"$scriptDir/gen-buildsys.sh\" \"$__ProjectRoot\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $scan_build $extraCmakeArguments $__cmakeargs"
 source "$scriptDir/gen-buildsys.sh" "$__ProjectRoot" "$intermediatesForBuild" $platformArch $__BuildType $generator $scan_build "$extraCmakeArguments" "$__cmakeargs"
 nextCommand="CONFIG_DIR=\"$__RepoRootDir/eng/common/cross\" \"$scriptDir/gen-buildsys.sh\" \"$__ProjectRoot\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $scan_build $extraCmakeArguments $__cmakeargs"
 echo "Invoking $nextCommand"
 eval $nextCommand

 if [ $? != 0 ]; then
 echo "${__ErrMsgPrefix}Failed to generate $message build project!"
Expand DownExpand Up@@ -1063,7 +1064,7 @@ __MsbuildDebugLogsDir="$__LogsDir/MsbuildDebugLogs"
__BinDir="$__RootBinDir/Product/$__BuildOS.$__BuildArch.$__BuildType"
__PackagesBinDir="$__BinDir/.nuget"
export __IntermediatesDir="$__RootBinDir/obj/$__BuildOS.$__BuildArch.$__BuildType"
export __ArtifactsIntermediatesDir="$__ProjectDir/artifacts/obj"
export __ArtifactsIntermediatesDir="$__RepoRootDir/artifacts/obj"
__isMSBuildOnNETCoreSupported=0
__CrossComponentBinDir="$__BinDir"

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix jit format 3#27

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.

 Sign up for GitHub

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

 Closed

jashook
wants to merge
14
commits into

from

 Closed


Fix jit format 3
#27
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
3a6925c

WIP: remaining changes to enable CoreCLR PR pipeline in the runtime repo


trylek Nov 11, 2019
1da2ebe

Fix location of empty.csproj in Linux build.sh


trylek Nov 11, 2019
cf32e9e

Fix path to CoreFX.issues.rsp file; hopefully fix Linux builds on ARM


trylek Nov 12, 2019
74ce55b

Two more path fixes


trylek Nov 12, 2019
c2d075a

Various pipeline fixes


trylek Nov 12, 2019
fb555f5

Crossgen comparison & format job fixes


trylek Nov 12, 2019
a414cea

More fixes for the formatting job


trylek Nov 12, 2019
14fb98d

Introduce repo root variable in format.py


trylek Nov 12, 2019
087e8fc

Try to fix Windows Formatting job by fixing slashes in path


trylek Nov 12, 2019
fe7217d

Shorten intermediate paths for two interop test native components


trylek Nov 12, 2019
a84d432

Initial attempt to fix format jobs

Nov 12, 2019
f423e18

Change the cwd to the bootstrap location

Nov 13, 2019
0518f65

Use tempdir for jitutils

Nov 13, 2019
2448f11

Remove funny try logic and rmtree

Nov 13, 2019

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


1 change: 1 addition & 0 deletions
NuGet.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
 <!-- TEST_RESTORE_SOURCES_INSERTION_LINE -->
 <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
 <add key="dotnet-coreclr" value="https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json" />
 <add key="myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
 <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
 </packageSources>
 <disabledPackageSources>
Expand Down

3 changes: 2 additions & 1 deletion
eng/helixcorefxtests.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,6 +85,7 @@
 TODO: ProjectDir, RootBinDir, TestWorkingDir, and TargetsWindows are global properties set in dir.props, remove the property assignment here when we port to arcade.
 -->
 <ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory)..\</ProjectDir>
 <ProjectDir Condition="Exists('$(ProjectDir).dotnet-runtime-placeholder')">$(ProjectDir)\src\coreclr\</ProjectDir>
 <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)bin\</RootBinDir>
 <TestWorkingDir Condition="'$(__TestWorkingDir)'==''">$(RootBinDir)tests\$(__BuildOS).$(__BuildArch).$(__BuildType)\</TestWorkingDir>
 <TargetsWindows Condition="'$(__BuildOS)' == 'Windows_NT'">true</TargetsWindows>
Expand DownExpand Up@@ -149,7 +150,7 @@
 </PropertyGroup>

 <ItemGroup>
 <_ProjectsToBuild Include="..\tests\testenvironment.proj">
 <_ProjectsToBuild Include="$(ProjectDir)tests\testenvironment.proj">
 <Properties>Scenario=$(Scenario);TestEnvFileName=$(TestEnvFilePath);TargetsWindows=$(TargetsWindows)</Properties>
 </_ProjectsToBuild>
 </ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/build-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
 displayName: Install native dependencies
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 # Necessary to install correct cmake version
 - script: $(coreClrRepoRootDir)eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
 - script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
 displayName: Install native dependencies


Expand Down

20 changes: 8 additions & 12 deletions
eng/pipelines/coreclr/templates/crossgen-comparison-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,14 +40,14 @@ jobs:
 value: $(osGroup).$(hostArchType)_$(archType).$(buildConfigUpper)
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - name: binDirectory
 value: $(Build.SourcesDirectory)/bin
 value: $(coreClrRepoRoot)/bin
 - name: productDirectory
 value: $(Build.SourcesDirectory)/bin/Product
 value: $(binDirectory)/Product
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - name: binDirectory
 value: $(Build.SourcesDirectory)\bin
 value: $(coreClrRepoRoot)\bin
 - name: productDirectory
 value: $(Build.SourcesDirectory)\bin\Product
 value: $(binDirectory\Product

 # Test job depends on the corresponding build job
 dependsOn: ${{ format('build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
Expand DownExpand Up@@ -83,20 +83,16 @@ jobs:


 # Populate Core_Root
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - script: ./build-test.sh $(buildConfig) $(archType) $(crossArg) generatelayoutonly
 displayName: Populate Core_Root
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - script: build-test.cmd $(buildConfig) $(archType) generateLayoutOnly
 displayName: Populate Core_Root
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) $(buildConfig) $(archType) $(crossArg) generatelayoutonly
 displayName: Populate Core_Root


 # Create baseline output on the host (x64) machine
 - task: PythonScript@0
 displayName: Create cross-platform crossgen baseline
 inputs:
 scriptSource: 'filePath'
 scriptPath: $(Build.SourcesDirectory)/tests/scripts/crossgen_comparison.py
 scriptPath: $(coreClrRepoRoot)/tests/scripts/crossgen_comparison.py
 ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 arguments:
 crossgen_framework
Expand DownExpand Up@@ -126,7 +122,7 @@ jobs:
 Creator: $(Creator)
 WorkItemTimeout: 1:00 # 1 hour
 WorkItemDirectory: '$(binDirectory)'
 CorrelationPayloadDirectory: '$(Build.SourcesDirectory)/tests/scripts'
 CorrelationPayloadDirectory: '$(coreClrRepoRoot)/tests/scripts'
 ${{ if ne(parameters.osName, 'Windows_NT') }}:
 WorkItemCommand:
 chmod +x $HELIX_WORKITEM_PAYLOAD/Product/$(targetFlavor)/crossgen;
Expand Down

8 changes: 4 additions & 4 deletions
eng/pipelines/coreclr/templates/format-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ parameters:

### Format job
jobs:
- template: xplat-job.yml
- template: xplat-pipeline-job.yml
 parameters:
 buildConfig: ${{ parameters.buildConfig }}
 archType: ${{ parameters.archType }}
Expand All@@ -32,12 +32,12 @@ jobs:
 displayName: Run tests/scripts/format.py
 inputs:
 scriptSource: 'filePath'
 scriptPath: $(Build.SourcesDirectory)/tests/scripts/format.py
 arguments: '-c $(Build.SourcesDirectory) -o $(osGroup) -a $(archType)'
 scriptPath: $(coreClrRepoRoot)/tests/scripts/format.py
 arguments: '-c $(coreClrRepoRoot) -o $(osGroup) -a $(archType)'
 - task: PublishBuildArtifacts@1
 displayName: Publish format.patch
 inputs:
 PathtoPublish: '$(Build.SourcesDirectory)/format.patch'
 PathtoPublish: '$(coreClrRepoRoot)/format.patch'
 ArtifactName: format.$(osGroup).$(archType).patch
 continueOnError: true
 condition: failed()

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/perf-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,9 +55,9 @@ jobs:

 # Create Core_Root
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - script: ./build-test.sh ${{ parameters.buildConfig }} ${{ parameters.archType }} generatelayoutonly
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.buildConfig }} ${{ parameters.archType }} generatelayoutonly
 displayName: Create Core_Root
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 # TODO: add generatelayoutonly to build-test.cmd.
 - script: build-test.cmd ${{ parameters.buildConfig }} ${{ parameters.archType }} skipmanaged skipnative
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.buildConfig }} ${{ parameters.archType }} skipmanaged skipnative
 displayName: Create Core_Root

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/run-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,7 +250,7 @@ jobs:

 # Choose which tests to send to Helix: CoreFX or CoreCLR.
 ${{ if eq(parameters.corefxTests, true) }}:
 helixProjectArguments: '$(coreClrRepoRoot)/eng/helixcorefxtests.proj'
 helixProjectArguments: '$(Build.SourcesDirectory)/eng/helixcorefxtests.proj'
 ${{ if ne(parameters.corefxTests, true) }}:
 helixProjectArguments: '$(coreClrRepoRoot)/tests/src/helixpublishwitharcade.proj'

Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/xplat-pipeline-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,9 +80,9 @@ jobs:
 value: '/'

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)/src/coreclr
 value: '$(Build.SourcesDirectory)/src/coreclr'

 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:'
 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)'
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/build-test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -537,7 +537,7 @@ build_native_projects()
 extraCmakeArguments="$extraCmakeArguments -DCLR_CMAKE_ENABLE_CODE_COVERAGE=1"
 fi

 nextCommand="\"$scriptDir/gen-buildsys.sh\" \"$__TestDir\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $extraCmakeArguments $__cmakeargs"
 nextCommand="CONFIG_DIR=\"$__RepoRootDir/eng/common/cross\" \"$scriptDir/gen-buildsys.sh\" \"$__TestDir\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $extraCmakeArguments $__cmakeargs"
 echo "Invoking $nextCommand"
 eval $nextCommand

Expand Down

9 changes: 5 additions & 4 deletions
src/coreclr/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,7 @@ build_native()
 __versionSourceFile="$intermediatesForBuild/version.c"
 if [ $__SkipGenerateVersion == 0 ]; then
 pwd
 "$__RepoRootDir/eng/common/msbuild.sh" $__ArcadeScriptArgs $__ProjectRoot/eng/empty.csproj \
 "$__RepoRootDir/eng/common/msbuild.sh" $__ArcadeScriptArgs $__RepoRootDir/eng/empty.csproj \
 /p:NativeVersionFile=$__versionSourceFile \
 /t:GenerateNativeVersionFile /restore \
 $__CommonMSBuildArgs $__UnprocessedBuildArgs
Expand DownExpand Up@@ -273,8 +273,9 @@ build_native()
 extraCmakeArguments="$extraCmakeArguments -DCLR_CMAKE_ENABLE_CODE_COVERAGE=1"
 fi

 echo "Invoking \"$scriptDir/gen-buildsys.sh\" \"$__ProjectRoot\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $scan_build $extraCmakeArguments $__cmakeargs"
 source "$scriptDir/gen-buildsys.sh" "$__ProjectRoot" "$intermediatesForBuild" $platformArch $__BuildType $generator $scan_build "$extraCmakeArguments" "$__cmakeargs"
 nextCommand="CONFIG_DIR=\"$__RepoRootDir/eng/common/cross\" \"$scriptDir/gen-buildsys.sh\" \"$__ProjectRoot\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $scan_build $extraCmakeArguments $__cmakeargs"
 echo "Invoking $nextCommand"
 eval $nextCommand

 if [ $? != 0 ]; then
 echo "${__ErrMsgPrefix}Failed to generate $message build project!"
Expand DownExpand Up@@ -1063,7 +1064,7 @@ __MsbuildDebugLogsDir="$__LogsDir/MsbuildDebugLogs"
__BinDir="$__RootBinDir/Product/$__BuildOS.$__BuildArch.$__BuildType"
__PackagesBinDir="$__BinDir/.nuget"
export __IntermediatesDir="$__RootBinDir/obj/$__BuildOS.$__BuildArch.$__BuildType"
export __ArtifactsIntermediatesDir="$__ProjectDir/artifacts/obj"
export __ArtifactsIntermediatesDir="$__RepoRootDir/artifacts/obj"
__isMSBuildOnNETCoreSupported=0
__CrossComponentBinDir="$__BinDir"

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix jit format 3#27

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.

 Sign up for GitHub

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

 Closed

jashook
wants to merge
14
commits into

from

 Closed


Fix jit format 3
#27
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
3a6925c

WIP: remaining changes to enable CoreCLR PR pipeline in the runtime repo


trylek Nov 11, 2019
1da2ebe

Fix location of empty.csproj in Linux build.sh


trylek Nov 11, 2019
cf32e9e

Fix path to CoreFX.issues.rsp file; hopefully fix Linux builds on ARM


trylek Nov 12, 2019
74ce55b

Two more path fixes


trylek Nov 12, 2019
c2d075a

Various pipeline fixes


trylek Nov 12, 2019
fb555f5

Crossgen comparison & format job fixes


trylek Nov 12, 2019
a414cea

More fixes for the formatting job


trylek Nov 12, 2019
14fb98d

Introduce repo root variable in format.py


trylek Nov 12, 2019
087e8fc

Try to fix Windows Formatting job by fixing slashes in path


trylek Nov 12, 2019
fe7217d

Shorten intermediate paths for two interop test native components


trylek Nov 12, 2019
a84d432

Initial attempt to fix format jobs

Nov 12, 2019
f423e18

Change the cwd to the bootstrap location

Nov 13, 2019
0518f65

Use tempdir for jitutils

Nov 13, 2019
2448f11

Remove funny try logic and rmtree

Nov 13, 2019

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


1 change: 1 addition & 0 deletions
NuGet.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
 <!-- TEST_RESTORE_SOURCES_INSERTION_LINE -->
 <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
 <add key="dotnet-coreclr" value="https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json" />
 <add key="myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
 <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
 </packageSources>
 <disabledPackageSources>
Expand Down

3 changes: 2 additions & 1 deletion
eng/helixcorefxtests.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,6 +85,7 @@
 TODO: ProjectDir, RootBinDir, TestWorkingDir, and TargetsWindows are global properties set in dir.props, remove the property assignment here when we port to arcade.
 -->
 <ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory)..\</ProjectDir>
 <ProjectDir Condition="Exists('$(ProjectDir).dotnet-runtime-placeholder')">$(ProjectDir)\src\coreclr\</ProjectDir>
 <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)bin\</RootBinDir>
 <TestWorkingDir Condition="'$(__TestWorkingDir)'==''">$(RootBinDir)tests\$(__BuildOS).$(__BuildArch).$(__BuildType)\</TestWorkingDir>
 <TargetsWindows Condition="'$(__BuildOS)' == 'Windows_NT'">true</TargetsWindows>
Expand DownExpand Up@@ -149,7 +150,7 @@
 </PropertyGroup>

 <ItemGroup>
 <_ProjectsToBuild Include="..\tests\testenvironment.proj">
 <_ProjectsToBuild Include="$(ProjectDir)tests\testenvironment.proj">
 <Properties>Scenario=$(Scenario);TestEnvFileName=$(TestEnvFilePath);TargetsWindows=$(TargetsWindows)</Properties>
 </_ProjectsToBuild>
 </ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/build-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
 displayName: Install native dependencies
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 # Necessary to install correct cmake version
 - script: $(coreClrRepoRootDir)eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
 - script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
 displayName: Install native dependencies


Expand Down

20 changes: 8 additions & 12 deletions
eng/pipelines/coreclr/templates/crossgen-comparison-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,14 +40,14 @@ jobs:
 value: $(osGroup).$(hostArchType)_$(archType).$(buildConfigUpper)
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - name: binDirectory
 value: $(Build.SourcesDirectory)/bin
 value: $(coreClrRepoRoot)/bin
 - name: productDirectory
 value: $(Build.SourcesDirectory)/bin/Product
 value: $(binDirectory)/Product
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - name: binDirectory
 value: $(Build.SourcesDirectory)\bin
 value: $(coreClrRepoRoot)\bin
 - name: productDirectory
 value: $(Build.SourcesDirectory)\bin\Product
 value: $(binDirectory\Product

 # Test job depends on the corresponding build job
 dependsOn: ${{ format('build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
Expand DownExpand Up@@ -83,20 +83,16 @@ jobs:


 # Populate Core_Root
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - script: ./build-test.sh $(buildConfig) $(archType) $(crossArg) generatelayoutonly
 displayName: Populate Core_Root
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - script: build-test.cmd $(buildConfig) $(archType) generateLayoutOnly
 displayName: Populate Core_Root
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) $(buildConfig) $(archType) $(crossArg) generatelayoutonly
 displayName: Populate Core_Root


 # Create baseline output on the host (x64) machine
 - task: PythonScript@0
 displayName: Create cross-platform crossgen baseline
 inputs:
 scriptSource: 'filePath'
 scriptPath: $(Build.SourcesDirectory)/tests/scripts/crossgen_comparison.py
 scriptPath: $(coreClrRepoRoot)/tests/scripts/crossgen_comparison.py
 ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 arguments:
 crossgen_framework
Expand DownExpand Up@@ -126,7 +122,7 @@ jobs:
 Creator: $(Creator)
 WorkItemTimeout: 1:00 # 1 hour
 WorkItemDirectory: '$(binDirectory)'
 CorrelationPayloadDirectory: '$(Build.SourcesDirectory)/tests/scripts'
 CorrelationPayloadDirectory: '$(coreClrRepoRoot)/tests/scripts'
 ${{ if ne(parameters.osName, 'Windows_NT') }}:
 WorkItemCommand:
 chmod +x $HELIX_WORKITEM_PAYLOAD/Product/$(targetFlavor)/crossgen;
Expand Down

8 changes: 4 additions & 4 deletions
eng/pipelines/coreclr/templates/format-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ parameters:

### Format job
jobs:
- template: xplat-job.yml
- template: xplat-pipeline-job.yml
 parameters:
 buildConfig: ${{ parameters.buildConfig }}
 archType: ${{ parameters.archType }}
Expand All@@ -32,12 +32,12 @@ jobs:
 displayName: Run tests/scripts/format.py
 inputs:
 scriptSource: 'filePath'
 scriptPath: $(Build.SourcesDirectory)/tests/scripts/format.py
 arguments: '-c $(Build.SourcesDirectory) -o $(osGroup) -a $(archType)'
 scriptPath: $(coreClrRepoRoot)/tests/scripts/format.py
 arguments: '-c $(coreClrRepoRoot) -o $(osGroup) -a $(archType)'
 - task: PublishBuildArtifacts@1
 displayName: Publish format.patch
 inputs:
 PathtoPublish: '$(Build.SourcesDirectory)/format.patch'
 PathtoPublish: '$(coreClrRepoRoot)/format.patch'
 ArtifactName: format.$(osGroup).$(archType).patch
 continueOnError: true
 condition: failed()

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/perf-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,9 +55,9 @@ jobs:

 # Create Core_Root
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - script: ./build-test.sh ${{ parameters.buildConfig }} ${{ parameters.archType }} generatelayoutonly
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.buildConfig }} ${{ parameters.archType }} generatelayoutonly
 displayName: Create Core_Root
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 # TODO: add generatelayoutonly to build-test.cmd.
 - script: build-test.cmd ${{ parameters.buildConfig }} ${{ parameters.archType }} skipmanaged skipnative
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.buildConfig }} ${{ parameters.archType }} skipmanaged skipnative
 displayName: Create Core_Root

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/run-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,7 +250,7 @@ jobs:

 # Choose which tests to send to Helix: CoreFX or CoreCLR.
 ${{ if eq(parameters.corefxTests, true) }}:
 helixProjectArguments: '$(coreClrRepoRoot)/eng/helixcorefxtests.proj'
 helixProjectArguments: '$(Build.SourcesDirectory)/eng/helixcorefxtests.proj'
 ${{ if ne(parameters.corefxTests, true) }}:
 helixProjectArguments: '$(coreClrRepoRoot)/tests/src/helixpublishwitharcade.proj'

Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/xplat-pipeline-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,9 +80,9 @@ jobs:
 value: '/'

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)/src/coreclr
 value: '$(Build.SourcesDirectory)/src/coreclr'

 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:'
 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)'
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/build-test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -537,7 +537,7 @@ build_native_projects()
 extraCmakeArguments="$extraCmakeArguments -DCLR_CMAKE_ENABLE_CODE_COVERAGE=1"
 fi

 nextCommand="\"$scriptDir/gen-buildsys.sh\" \"$__TestDir\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $extraCmakeArguments $__cmakeargs"
 nextCommand="CONFIG_DIR=\"$__RepoRootDir/eng/common/cross\" \"$scriptDir/gen-buildsys.sh\" \"$__TestDir\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $extraCmakeArguments $__cmakeargs"
 echo "Invoking $nextCommand"
 eval $nextCommand

Expand Down

9 changes: 5 additions & 4 deletions
src/coreclr/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,7 @@ build_native()
 __versionSourceFile="$intermediatesForBuild/version.c"
 if [ $__SkipGenerateVersion == 0 ]; then
 pwd
 "$__RepoRootDir/eng/common/msbuild.sh" $__ArcadeScriptArgs $__ProjectRoot/eng/empty.csproj \
 "$__RepoRootDir/eng/common/msbuild.sh" $__ArcadeScriptArgs $__RepoRootDir/eng/empty.csproj \
 /p:NativeVersionFile=$__versionSourceFile \
 /t:GenerateNativeVersionFile /restore \
 $__CommonMSBuildArgs $__UnprocessedBuildArgs
Expand DownExpand Up@@ -273,8 +273,9 @@ build_native()
 extraCmakeArguments="$extraCmakeArguments -DCLR_CMAKE_ENABLE_CODE_COVERAGE=1"
 fi

 echo "Invoking \"$scriptDir/gen-buildsys.sh\" \"$__ProjectRoot\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $scan_build $extraCmakeArguments $__cmakeargs"
 source "$scriptDir/gen-buildsys.sh" "$__ProjectRoot" "$intermediatesForBuild" $platformArch $__BuildType $generator $scan_build "$extraCmakeArguments" "$__cmakeargs"
 nextCommand="CONFIG_DIR=\"$__RepoRootDir/eng/common/cross\" \"$scriptDir/gen-buildsys.sh\" \"$__ProjectRoot\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $scan_build $extraCmakeArguments $__cmakeargs"
 echo "Invoking $nextCommand"
 eval $nextCommand

 if [ $? != 0 ]; then
 echo "${__ErrMsgPrefix}Failed to generate $message build project!"
Expand DownExpand Up@@ -1063,7 +1064,7 @@ __MsbuildDebugLogsDir="$__LogsDir/MsbuildDebugLogs"
__BinDir="$__RootBinDir/Product/$__BuildOS.$__BuildArch.$__BuildType"
__PackagesBinDir="$__BinDir/.nuget"
export __IntermediatesDir="$__RootBinDir/obj/$__BuildOS.$__BuildArch.$__BuildType"
export __ArtifactsIntermediatesDir="$__ProjectDir/artifacts/obj"
export __ArtifactsIntermediatesDir="$__RepoRootDir/artifacts/obj"
__isMSBuildOnNETCoreSupported=0
__CrossComponentBinDir="$__BinDir"

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Fix jit format 3#27

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.

 Sign up for GitHub

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

 Closed

jashook
wants to merge
14
commits into

from

 Closed


Fix jit format 3
#27
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
3a6925c

WIP: remaining changes to enable CoreCLR PR pipeline in the runtime repo


trylek Nov 11, 2019
1da2ebe

Fix location of empty.csproj in Linux build.sh


trylek Nov 11, 2019
cf32e9e

Fix path to CoreFX.issues.rsp file; hopefully fix Linux builds on ARM


trylek Nov 12, 2019
74ce55b

Two more path fixes


trylek Nov 12, 2019
c2d075a

Various pipeline fixes


trylek Nov 12, 2019
fb555f5

Crossgen comparison & format job fixes


trylek Nov 12, 2019
a414cea

More fixes for the formatting job


trylek Nov 12, 2019
14fb98d

Introduce repo root variable in format.py


trylek Nov 12, 2019
087e8fc

Try to fix Windows Formatting job by fixing slashes in path


trylek Nov 12, 2019
fe7217d

Shorten intermediate paths for two interop test native components


trylek Nov 12, 2019
a84d432

Initial attempt to fix format jobs

Nov 12, 2019
f423e18

Change the cwd to the bootstrap location

Nov 13, 2019
0518f65

Use tempdir for jitutils

Nov 13, 2019
2448f11

Remove funny try logic and rmtree

Nov 13, 2019

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


1 change: 1 addition & 0 deletions
NuGet.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@
 <!-- TEST_RESTORE_SOURCES_INSERTION_LINE -->
 <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
 <add key="dotnet-coreclr" value="https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json" />
 <add key="myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
 <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
 </packageSources>
 <disabledPackageSources>
Expand Down

3 changes: 2 additions & 1 deletion
eng/helixcorefxtests.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,6 +85,7 @@
 TODO: ProjectDir, RootBinDir, TestWorkingDir, and TargetsWindows are global properties set in dir.props, remove the property assignment here when we port to arcade.
 -->
 <ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory)..\</ProjectDir>
 <ProjectDir Condition="Exists('$(ProjectDir).dotnet-runtime-placeholder')">$(ProjectDir)\src\coreclr\</ProjectDir>
 <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)bin\</RootBinDir>
 <TestWorkingDir Condition="'$(__TestWorkingDir)'==''">$(RootBinDir)tests\$(__BuildOS).$(__BuildArch).$(__BuildType)\</TestWorkingDir>
 <TargetsWindows Condition="'$(__BuildOS)' == 'Windows_NT'">true</TargetsWindows>
Expand DownExpand Up@@ -149,7 +150,7 @@
 </PropertyGroup>

 <ItemGroup>
 <_ProjectsToBuild Include="..\tests\testenvironment.proj">
 <_ProjectsToBuild Include="$(ProjectDir)tests\testenvironment.proj">
 <Properties>Scenario=$(Scenario);TestEnvFileName=$(TestEnvFilePath);TargetsWindows=$(TargetsWindows)</Properties>
 </_ProjectsToBuild>
 </ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/build-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
 displayName: Install native dependencies
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 # Necessary to install correct cmake version
 - script: $(coreClrRepoRootDir)eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
 - script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
 displayName: Install native dependencies


Expand Down

20 changes: 8 additions & 12 deletions
eng/pipelines/coreclr/templates/crossgen-comparison-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,14 +40,14 @@ jobs:
 value: $(osGroup).$(hostArchType)_$(archType).$(buildConfigUpper)
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - name: binDirectory
 value: $(Build.SourcesDirectory)/bin
 value: $(coreClrRepoRoot)/bin
 - name: productDirectory
 value: $(Build.SourcesDirectory)/bin/Product
 value: $(binDirectory)/Product
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - name: binDirectory
 value: $(Build.SourcesDirectory)\bin
 value: $(coreClrRepoRoot)\bin
 - name: productDirectory
 value: $(Build.SourcesDirectory)\bin\Product
 value: $(binDirectory\Product

 # Test job depends on the corresponding build job
 dependsOn: ${{ format('build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
Expand DownExpand Up@@ -83,20 +83,16 @@ jobs:


 # Populate Core_Root
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - script: ./build-test.sh $(buildConfig) $(archType) $(crossArg) generatelayoutonly
 displayName: Populate Core_Root
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - script: build-test.cmd $(buildConfig) $(archType) generateLayoutOnly
 displayName: Populate Core_Root
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) $(buildConfig) $(archType) $(crossArg) generatelayoutonly
 displayName: Populate Core_Root


 # Create baseline output on the host (x64) machine
 - task: PythonScript@0
 displayName: Create cross-platform crossgen baseline
 inputs:
 scriptSource: 'filePath'
 scriptPath: $(Build.SourcesDirectory)/tests/scripts/crossgen_comparison.py
 scriptPath: $(coreClrRepoRoot)/tests/scripts/crossgen_comparison.py
 ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 arguments:
 crossgen_framework
Expand DownExpand Up@@ -126,7 +122,7 @@ jobs:
 Creator: $(Creator)
 WorkItemTimeout: 1:00 # 1 hour
 WorkItemDirectory: '$(binDirectory)'
 CorrelationPayloadDirectory: '$(Build.SourcesDirectory)/tests/scripts'
 CorrelationPayloadDirectory: '$(coreClrRepoRoot)/tests/scripts'
 ${{ if ne(parameters.osName, 'Windows_NT') }}:
 WorkItemCommand:
 chmod +x $HELIX_WORKITEM_PAYLOAD/Product/$(targetFlavor)/crossgen;
Expand Down

8 changes: 4 additions & 4 deletions
eng/pipelines/coreclr/templates/format-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ parameters:

### Format job
jobs:
- template: xplat-job.yml
- template: xplat-pipeline-job.yml
 parameters:
 buildConfig: ${{ parameters.buildConfig }}
 archType: ${{ parameters.archType }}
Expand All@@ -32,12 +32,12 @@ jobs:
 displayName: Run tests/scripts/format.py
 inputs:
 scriptSource: 'filePath'
 scriptPath: $(Build.SourcesDirectory)/tests/scripts/format.py
 arguments: '-c $(Build.SourcesDirectory) -o $(osGroup) -a $(archType)'
 scriptPath: $(coreClrRepoRoot)/tests/scripts/format.py
 arguments: '-c $(coreClrRepoRoot) -o $(osGroup) -a $(archType)'
 - task: PublishBuildArtifacts@1
 displayName: Publish format.patch
 inputs:
 PathtoPublish: '$(Build.SourcesDirectory)/format.patch'
 PathtoPublish: '$(coreClrRepoRoot)/format.patch'
 ArtifactName: format.$(osGroup).$(archType).patch
 continueOnError: true
 condition: failed()

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/perf-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,9 +55,9 @@ jobs:

 # Create Core_Root
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - script: ./build-test.sh ${{ parameters.buildConfig }} ${{ parameters.archType }} generatelayoutonly
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.buildConfig }} ${{ parameters.archType }} generatelayoutonly
 displayName: Create Core_Root
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 # TODO: add generatelayoutonly to build-test.cmd.
 - script: build-test.cmd ${{ parameters.buildConfig }} ${{ parameters.archType }} skipmanaged skipnative
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.buildConfig }} ${{ parameters.archType }} skipmanaged skipnative
 displayName: Create Core_Root

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/run-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,7 +250,7 @@ jobs:

 # Choose which tests to send to Helix: CoreFX or CoreCLR.
 ${{ if eq(parameters.corefxTests, true) }}:
 helixProjectArguments: '$(coreClrRepoRoot)/eng/helixcorefxtests.proj'
 helixProjectArguments: '$(Build.SourcesDirectory)/eng/helixcorefxtests.proj'
 ${{ if ne(parameters.corefxTests, true) }}:
 helixProjectArguments: '$(coreClrRepoRoot)/tests/src/helixpublishwitharcade.proj'

Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/xplat-pipeline-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,9 +80,9 @@ jobs:
 value: '/'

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)/src/coreclr
 value: '$(Build.SourcesDirectory)/src/coreclr'

 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:'
 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)'
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/build-test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -537,7 +537,7 @@ build_native_projects()
 extraCmakeArguments="$extraCmakeArguments -DCLR_CMAKE_ENABLE_CODE_COVERAGE=1"
 fi

 nextCommand="\"$scriptDir/gen-buildsys.sh\" \"$__TestDir\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $extraCmakeArguments $__cmakeargs"
 nextCommand="CONFIG_DIR=\"$__RepoRootDir/eng/common/cross\" \"$scriptDir/gen-buildsys.sh\" \"$__TestDir\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $extraCmakeArguments $__cmakeargs"
 echo "Invoking $nextCommand"
 eval $nextCommand

Expand Down

9 changes: 5 additions & 4 deletions
src/coreclr/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,7 @@ build_native()
 __versionSourceFile="$intermediatesForBuild/version.c"
 if [ $__SkipGenerateVersion == 0 ]; then
 pwd
 "$__RepoRootDir/eng/common/msbuild.sh" $__ArcadeScriptArgs $__ProjectRoot/eng/empty.csproj \
 "$__RepoRootDir/eng/common/msbuild.sh" $__ArcadeScriptArgs $__RepoRootDir/eng/empty.csproj \
 /p:NativeVersionFile=$__versionSourceFile \
 /t:GenerateNativeVersionFile /restore \
 $__CommonMSBuildArgs $__UnprocessedBuildArgs
Expand DownExpand Up@@ -273,8 +273,9 @@ build_native()
 extraCmakeArguments="$extraCmakeArguments -DCLR_CMAKE_ENABLE_CODE_COVERAGE=1"
 fi

 echo "Invoking \"$scriptDir/gen-buildsys.sh\" \"$__ProjectRoot\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $scan_build $extraCmakeArguments $__cmakeargs"
 source "$scriptDir/gen-buildsys.sh" "$__ProjectRoot" "$intermediatesForBuild" $platformArch $__BuildType $generator $scan_build "$extraCmakeArguments" "$__cmakeargs"
 nextCommand="CONFIG_DIR=\"$__RepoRootDir/eng/common/cross\" \"$scriptDir/gen-buildsys.sh\" \"$__ProjectRoot\" \"$intermediatesForBuild\" $platformArch $__BuildType $generator $scan_build $extraCmakeArguments $__cmakeargs"
 echo "Invoking $nextCommand"
 eval $nextCommand

 if [ $? != 0 ]; then
 echo "${__ErrMsgPrefix}Failed to generate $message build project!"
Expand DownExpand Up@@ -1063,7 +1064,7 @@ __MsbuildDebugLogsDir="$__LogsDir/MsbuildDebugLogs"
__BinDir="$__RootBinDir/Product/$__BuildOS.$__BuildArch.$__BuildType"
__PackagesBinDir="$__BinDir/.nuget"
export __IntermediatesDir="$__RootBinDir/obj/$__BuildOS.$__BuildArch.$__BuildType"
export __ArtifactsIntermediatesDir="$__ProjectDir/artifacts/obj"
export __ArtifactsIntermediatesDir="$__RepoRootDir/artifacts/obj"
__isMSBuildOnNETCoreSupported=0
__CrossComponentBinDir="$__BinDir"

Expand Down
Loading