Stop skipping tests in installer pipeline on linux_x64#89953

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

Merged
elinor-fung merged 3 commits into from
Aug 18, 2023
Merged

Stop skipping tests in installer pipeline on linux_x64 #89953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1d20cfc
Stop skipping tests on Linux_x64
elinor-fung Aug 3, 2023
1200ae2
Fix uploading of binaries/symbols on failure
elinor-fung Aug 3, 2023
5649154
Update test
elinor-fung Aug 3, 2023
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
13 changes: 11 additions & 2 deletions eng/pipelines/installer/jobs/build-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -86,18 +86,26 @@ jobs:
- name: OfficialBuildArg
value: ''

# Explicitly enable tests for linux even though it is a cross build using mariner
# They still work in this configuration and until they run on Helix, it is our only
# linux test coverage in the installer pipeline
- name: SkipTests
value: ${{ or(
not(in(parameters.archType, 'x64', 'x86')),
eq(parameters.runtimeFlavor, 'mono'),
eq(parameters.isOfficialBuild, true),
eq(parameters.crossBuild, true),
and(
eq(parameters.crossBuild, true),
not(and(
eq(parameters.osGroup, 'linux'),
eq(parameters.osSubgroup, ''))
)),
eq(parameters.pgoType, 'PGO')) }}

- name: BuildAction
value: -test

- ${{ if eq(or(not(in(parameters.archType, 'x64', 'x86')), eq(parameters.runtimeFlavor, 'mono'), eq(parameters.isOfficialBuild, true), eq(parameters.crossBuild, true), eq(parameters.pgoType, 'PGO')), true) }}:
- ${{ if eq(or(not(in(parameters.archType, 'x64', 'x86')), eq(parameters.runtimeFlavor, 'mono'), eq(parameters.isOfficialBuild, true), and(eq(parameters.crossBuild, true), not(and(eq(parameters.osGroup, 'linux'), eq(parameters.osSubgroup, '')))), eq(parameters.pgoType, 'PGO')), true) }}:
- name: BuildAction
value: ''

Expand DownExpand Up@@ -378,6 +386,7 @@ jobs:
runtimeVariant: ${{ parameters.runtimeVariant }}
isOfficialBuild: ${{ eq(parameters.isOfficialBuild, true) }}
pgoType: ${{ parameters.pgoType }}
skipTests: ${{ eq(variables.SkipTests, true) }}

- ${{ if ne(parameters.osGroup, 'windows') }}:
- script: set -x && df -h
Expand Down
50 changes: 36 additions & 14 deletions src/installer/tests/HostActivation.Tests/DependencyResolution/RidAssetResolution.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,23 @@ public class TestSetup

// Expected behaviour of the test based on above settings
public bool ShouldUseRidGraph => UseRidGraph == true;
public bool ShouldUseFallbackRid => ShouldUseRidGraph && (Rid == UnknownRid || !HasRidGraph);

public bool? ShouldUseFallbackRid
{
get
{
if (!ShouldUseRidGraph)
return false;

if (Rid == UnknownRid || !HasRidGraph)
return true;

// We use the product RID graph for testing (for cases with a RID graph). If the test is running
// on a platform that isn't in that RID graph, we may end up with the fallback even when the RID
// graph is used and RID is not unknown. Value of null indicates this state.
return null;
}
}

public override string ToString() => $"""
{nameof(Rid)}: {(Rid ?? "<null>")}
Expand DownExpand Up@@ -623,18 +639,20 @@ protected override void RunTest(

UpdateAppConfigForTest(app, setup, copyOnUpdate: false);

dotnet.Exec(app.AppDll)
var result = dotnet.Exec(app.AppDll)
.EnableTracingAndCaptureOutputs()
.RuntimeId(setup.Rid)
.Execute()
.Should().Pass()
.Execute();
result.Should().Pass()
.And.HaveResolvedAssembly(expected.IncludedAssemblyPaths, app)
.And.NotHaveResolvedAssembly(expected.ExcludedAssemblyPaths, app)
.And.HaveResolvedNativeLibraryPath(expected.IncludedNativeLibraryPaths, app)
.And.NotHaveResolvedNativeLibraryPath(expected.ExcludedNativeLibraryPaths, app)
.And.HaveReadRidGraph(setup.ShouldUseRidGraph)
.And.HaveUsedFallbackRid(setup.ShouldUseFallbackRid)
.And.HaveUsedFrameworkProbe(dotnet.GreatestVersionSharedFxPath, level: 1);

if (setup.ShouldUseFallbackRid.HasValue)
result.Should().HaveUsedFallbackRid(setup.ShouldUseFallbackRid.Value);
}
}
}
Expand DownExpand Up@@ -674,17 +692,19 @@ protected override void RunTest(

TestApp app = UpdateAppConfigForTest(SharedState.FrameworkReferenceApp, setup, copyOnUpdate: true);

SharedState.RunComponentResolutionTest(component.AppDll, app, dotnet.GreatestVersionHostFxrPath, command => command
.RuntimeId(setup.Rid))
.Should().Pass()
var result = SharedState.RunComponentResolutionTest(component.AppDll, app, dotnet.GreatestVersionHostFxrPath, command => command
.RuntimeId(setup.Rid));
result.Should().Pass()
.And.HaveSuccessfullyResolvedComponentDependencies()
.And.HaveResolvedComponentDependencyAssembly(expected.IncludedAssemblyPaths, component)
.And.NotHaveResolvedComponentDependencyAssembly(expected.ExcludedAssemblyPaths, component)
.And.HaveResolvedComponentDependencyNativeLibraryPath(expected.IncludedNativeLibraryPaths, component)
.And.NotHaveResolvedComponentDependencyNativeLibraryPath(expected.ExcludedNativeLibraryPaths, component)
.And.HaveReadRidGraph(setup.ShouldUseRidGraph)
.And.HaveUsedFallbackRid(setup.ShouldUseFallbackRid)
.And.NotHaveUsedFrameworkProbe(dotnet.GreatestVersionSharedFxPath);

if (setup.ShouldUseFallbackRid.HasValue)
result.Should().HaveUsedFallbackRid(setup.ShouldUseFallbackRid.Value);
}
}

Expand DownExpand Up@@ -723,16 +743,18 @@ protected override void RunTest(

app = UpdateAppConfigForTest(app, setup, copyOnUpdate: true);

SharedState.RunComponentResolutionTest(component.AppDll, app, app.Location, command => command
.RuntimeId(setup.Rid))
.Should().Pass()
var result = SharedState.RunComponentResolutionTest(component.AppDll, app, app.Location, command => command
.RuntimeId(setup.Rid));
result.Should().Pass()
.And.HaveSuccessfullyResolvedComponentDependencies()
.And.HaveResolvedComponentDependencyAssembly(expected.IncludedAssemblyPaths, component)
.And.NotHaveResolvedComponentDependencyAssembly(expected.ExcludedAssemblyPaths, component)
.And.HaveResolvedComponentDependencyNativeLibraryPath(expected.IncludedNativeLibraryPaths, component)
.And.NotHaveResolvedComponentDependencyNativeLibraryPath(expected.ExcludedNativeLibraryPaths, component)
.And.HaveReadRidGraph(setup.ShouldUseRidGraph)
.And.HaveUsedFallbackRid(setup.ShouldUseFallbackRid);
.And.HaveReadRidGraph(setup.ShouldUseRidGraph);

if (setup.ShouldUseFallbackRid.HasValue)
result.Should().HaveUsedFallbackRid(setup.ShouldUseFallbackRid.Value);
}

public class ComponentSharedTestState : ComponentSharedTestStateBase
Expand Down
, '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
Stop skipping tests in installer pipeline on linux_x64#89953

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

 Merged

elinor-fung
merged 3 commits into

from

Aug 18, 2023
 Merged


Stop skipping tests in installer pipeline on linux_x64
#89953
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
1d20cfc

Stop skipping tests on Linux_x64


elinor-fung Aug 3, 2023
1200ae2

Fix uploading of binaries/symbols on failure


elinor-fung Aug 3, 2023
5649154

Update test


elinor-fung Aug 3, 2023

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


13 changes: 11 additions & 2 deletions
eng/pipelines/installer/jobs/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,18 +86,26 @@ jobs:
 - name: OfficialBuildArg
 value: ''

 # Explicitly enable tests for linux even though it is a cross build using mariner
 # They still work in this configuration and until they run on Helix, it is our only
 # linux test coverage in the installer pipeline
 - name: SkipTests
 value: ${{ or(
 not(in(parameters.archType, 'x64', 'x86')),
 eq(parameters.runtimeFlavor, 'mono'),
 eq(parameters.isOfficialBuild, true),
 eq(parameters.crossBuild, true),
 and(
 eq(parameters.crossBuild, true),
 not(and(
 eq(parameters.osGroup, 'linux'),
 eq(parameters.osSubgroup, ''))
 )),
 eq(parameters.pgoType, 'PGO')) }}

 - name: BuildAction
 value: -test

 - ${{ if eq(or(not(in(parameters.archType, 'x64', 'x86')), eq(parameters.runtimeFlavor, 'mono'), eq(parameters.isOfficialBuild, true), eq(parameters.crossBuild, true), eq(parameters.pgoType, 'PGO')), true) }}:
 - ${{ if eq(or(not(in(parameters.archType, 'x64', 'x86')), eq(parameters.runtimeFlavor, 'mono'), eq(parameters.isOfficialBuild, true), and(eq(parameters.crossBuild, true), not(and(eq(parameters.osGroup, 'linux'), eq(parameters.osSubgroup, '')))), eq(parameters.pgoType, 'PGO')), true) }}:
 - name: BuildAction
 value: ''

Expand DownExpand Up@@ -378,6 +386,7 @@ jobs:
 runtimeVariant: ${{ parameters.runtimeVariant }}
 isOfficialBuild: ${{ eq(parameters.isOfficialBuild, true) }}
 pgoType: ${{ parameters.pgoType }}
 skipTests: ${{ eq(variables.SkipTests, true) }}

 - ${{ if ne(parameters.osGroup, 'windows') }}:
 - script: set -x && df -h
Expand Down

50 changes: 36 additions & 14 deletions
src/installer/tests/HostActivation.Tests/DependencyResolution/RidAssetResolution.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,23 @@ public class TestSetup

 // Expected behaviour of the test based on above settings
 public bool ShouldUseRidGraph => UseRidGraph == true;
 public bool ShouldUseFallbackRid => ShouldUseRidGraph && (Rid == UnknownRid || !HasRidGraph);

 public bool? ShouldUseFallbackRid
 {
 get
 {
 if (!ShouldUseRidGraph)
 return false;

 if (Rid == UnknownRid || !HasRidGraph)
 return true;

 // We use the product RID graph for testing (for cases with a RID graph). If the test is running
 // on a platform that isn't in that RID graph, we may end up with the fallback even when the RID
 // graph is used and RID is not unknown. Value of null indicates this state.
 return null;
 }
 }

 public override string ToString() => $"""
 {nameof(Rid)}: {(Rid ?? "<null>")}
Expand DownExpand Up@@ -623,18 +639,20 @@ protected override void RunTest(

 UpdateAppConfigForTest(app, setup, copyOnUpdate: false);

 dotnet.Exec(app.AppDll)
var result = dotnet.Exec(app.AppDll)
 .EnableTracingAndCaptureOutputs()
 .RuntimeId(setup.Rid)
 .Execute()
.Should().Pass()
 .Execute();
result.Should().Pass()
 .And.HaveResolvedAssembly(expected.IncludedAssemblyPaths, app)
 .And.NotHaveResolvedAssembly(expected.ExcludedAssemblyPaths, app)
 .And.HaveResolvedNativeLibraryPath(expected.IncludedNativeLibraryPaths, app)
 .And.NotHaveResolvedNativeLibraryPath(expected.ExcludedNativeLibraryPaths, app)
 .And.HaveReadRidGraph(setup.ShouldUseRidGraph)
 .And.HaveUsedFallbackRid(setup.ShouldUseFallbackRid)
 .And.HaveUsedFrameworkProbe(dotnet.GreatestVersionSharedFxPath, level: 1);

 if (setup.ShouldUseFallbackRid.HasValue)
 result.Should().HaveUsedFallbackRid(setup.ShouldUseFallbackRid.Value);
 }
 }
 }
Expand DownExpand Up@@ -674,17 +692,19 @@ protected override void RunTest(

 TestApp app = UpdateAppConfigForTest(SharedState.FrameworkReferenceApp, setup, copyOnUpdate: true);

 SharedState.RunComponentResolutionTest(component.AppDll, app, dotnet.GreatestVersionHostFxrPath, command => command
 .RuntimeId(setup.Rid))
.Should().Pass()
var result = SharedState.RunComponentResolutionTest(component.AppDll, app, dotnet.GreatestVersionHostFxrPath, command => command
 .RuntimeId(setup.Rid));
result.Should().Pass()
 .And.HaveSuccessfullyResolvedComponentDependencies()
 .And.HaveResolvedComponentDependencyAssembly(expected.IncludedAssemblyPaths, component)
 .And.NotHaveResolvedComponentDependencyAssembly(expected.ExcludedAssemblyPaths, component)
 .And.HaveResolvedComponentDependencyNativeLibraryPath(expected.IncludedNativeLibraryPaths, component)
 .And.NotHaveResolvedComponentDependencyNativeLibraryPath(expected.ExcludedNativeLibraryPaths, component)
 .And.HaveReadRidGraph(setup.ShouldUseRidGraph)
 .And.HaveUsedFallbackRid(setup.ShouldUseFallbackRid)
 .And.NotHaveUsedFrameworkProbe(dotnet.GreatestVersionSharedFxPath);

 if (setup.ShouldUseFallbackRid.HasValue)
 result.Should().HaveUsedFallbackRid(setup.ShouldUseFallbackRid.Value);
 }
 }

Expand DownExpand Up@@ -723,16 +743,18 @@ protected override void RunTest(

 app = UpdateAppConfigForTest(app, setup, copyOnUpdate: true);

 SharedState.RunComponentResolutionTest(component.AppDll, app, app.Location, command => command
 .RuntimeId(setup.Rid))
.Should().Pass()
var result = SharedState.RunComponentResolutionTest(component.AppDll, app, app.Location, command => command
 .RuntimeId(setup.Rid));
result.Should().Pass()
 .And.HaveSuccessfullyResolvedComponentDependencies()
 .And.HaveResolvedComponentDependencyAssembly(expected.IncludedAssemblyPaths, component)
 .And.NotHaveResolvedComponentDependencyAssembly(expected.ExcludedAssemblyPaths, component)
 .And.HaveResolvedComponentDependencyNativeLibraryPath(expected.IncludedNativeLibraryPaths, component)
 .And.NotHaveResolvedComponentDependencyNativeLibraryPath(expected.ExcludedNativeLibraryPaths, component)
 .And.HaveReadRidGraph(setup.ShouldUseRidGraph)
 .And.HaveUsedFallbackRid(setup.ShouldUseFallbackRid);
 .And.HaveReadRidGraph(setup.ShouldUseRidGraph);

 if (setup.ShouldUseFallbackRid.HasValue)
 result.Should().HaveUsedFallbackRid(setup.ShouldUseFallbackRid.Value);
 }

 public class ComponentSharedTestState : ComponentSharedTestStateBase
Expand Down

, '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
Stop skipping tests in installer pipeline on linux_x64#89953

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

 Merged

elinor-fung
merged 3 commits into

from

Aug 18, 2023
 Merged


Stop skipping tests in installer pipeline on linux_x64
#89953
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
1d20cfc

Stop skipping tests on Linux_x64


elinor-fung Aug 3, 2023
1200ae2

Fix uploading of binaries/symbols on failure


elinor-fung Aug 3, 2023
5649154

Update test


elinor-fung Aug 3, 2023

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


13 changes: 11 additions & 2 deletions
eng/pipelines/installer/jobs/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,18 +86,26 @@ jobs:
 - name: OfficialBuildArg
 value: ''

 # Explicitly enable tests for linux even though it is a cross build using mariner
 # They still work in this configuration and until they run on Helix, it is our only
 # linux test coverage in the installer pipeline
 - name: SkipTests
 value: ${{ or(
 not(in(parameters.archType, 'x64', 'x86')),
 eq(parameters.runtimeFlavor, 'mono'),
 eq(parameters.isOfficialBuild, true),
 eq(parameters.crossBuild, true),
 and(
 eq(parameters.crossBuild, true),
 not(and(
 eq(parameters.osGroup, 'linux'),
 eq(parameters.osSubgroup, ''))
 )),
 eq(parameters.pgoType, 'PGO')) }}

 - name: BuildAction
 value: -test

 - ${{ if eq(or(not(in(parameters.archType, 'x64', 'x86')), eq(parameters.runtimeFlavor, 'mono'), eq(parameters.isOfficialBuild, true), eq(parameters.crossBuild, true), eq(parameters.pgoType, 'PGO')), true) }}:
 - ${{ if eq(or(not(in(parameters.archType, 'x64', 'x86')), eq(parameters.runtimeFlavor, 'mono'), eq(parameters.isOfficialBuild, true), and(eq(parameters.crossBuild, true), not(and(eq(parameters.osGroup, 'linux'), eq(parameters.osSubgroup, '')))), eq(parameters.pgoType, 'PGO')), true) }}:
 - name: BuildAction
 value: ''

Expand DownExpand Up@@ -378,6 +386,7 @@ jobs:
 runtimeVariant: ${{ parameters.runtimeVariant }}
 isOfficialBuild: ${{ eq(parameters.isOfficialBuild, true) }}
 pgoType: ${{ parameters.pgoType }}
 skipTests: ${{ eq(variables.SkipTests, true) }}

 - ${{ if ne(parameters.osGroup, 'windows') }}:
 - script: set -x && df -h
Expand Down

50 changes: 36 additions & 14 deletions
src/installer/tests/HostActivation.Tests/DependencyResolution/RidAssetResolution.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,23 @@ public class TestSetup

 // Expected behaviour of the test based on above settings
 public bool ShouldUseRidGraph => UseRidGraph == true;
 public bool ShouldUseFallbackRid => ShouldUseRidGraph && (Rid == UnknownRid || !HasRidGraph);

 public bool? ShouldUseFallbackRid
 {
 get
 {
 if (!ShouldUseRidGraph)
 return false;

 if (Rid == UnknownRid || !HasRidGraph)
 return true;

 // We use the product RID graph for testing (for cases with a RID graph). If the test is running
 // on a platform that isn't in that RID graph, we may end up with the fallback even when the RID
 // graph is used and RID is not unknown. Value of null indicates this state.
 return null;
 }
 }

 public override string ToString() => $"""
 {nameof(Rid)}: {(Rid ?? "<null>")}
Expand DownExpand Up@@ -623,18 +639,20 @@ protected override void RunTest(

 UpdateAppConfigForTest(app, setup, copyOnUpdate: false);

 dotnet.Exec(app.AppDll)
var result = dotnet.Exec(app.AppDll)
 .EnableTracingAndCaptureOutputs()
 .RuntimeId(setup.Rid)
 .Execute()
.Should().Pass()
 .Execute();
result.Should().Pass()
 .And.HaveResolvedAssembly(expected.IncludedAssemblyPaths, app)
 .And.NotHaveResolvedAssembly(expected.ExcludedAssemblyPaths, app)
 .And.HaveResolvedNativeLibraryPath(expected.IncludedNativeLibraryPaths, app)
 .And.NotHaveResolvedNativeLibraryPath(expected.ExcludedNativeLibraryPaths, app)
 .And.HaveReadRidGraph(setup.ShouldUseRidGraph)
 .And.HaveUsedFallbackRid(setup.ShouldUseFallbackRid)
 .And.HaveUsedFrameworkProbe(dotnet.GreatestVersionSharedFxPath, level: 1);

 if (setup.ShouldUseFallbackRid.HasValue)
 result.Should().HaveUsedFallbackRid(setup.ShouldUseFallbackRid.Value);
 }
 }
 }
Expand DownExpand Up@@ -674,17 +692,19 @@ protected override void RunTest(

 TestApp app = UpdateAppConfigForTest(SharedState.FrameworkReferenceApp, setup, copyOnUpdate: true);

 SharedState.RunComponentResolutionTest(component.AppDll, app, dotnet.GreatestVersionHostFxrPath, command => command
 .RuntimeId(setup.Rid))
.Should().Pass()
var result = SharedState.RunComponentResolutionTest(component.AppDll, app, dotnet.GreatestVersionHostFxrPath, command => command
 .RuntimeId(setup.Rid));
result.Should().Pass()
 .And.HaveSuccessfullyResolvedComponentDependencies()
 .And.HaveResolvedComponentDependencyAssembly(expected.IncludedAssemblyPaths, component)
 .And.NotHaveResolvedComponentDependencyAssembly(expected.ExcludedAssemblyPaths, component)
 .And.HaveResolvedComponentDependencyNativeLibraryPath(expected.IncludedNativeLibraryPaths, component)
 .And.NotHaveResolvedComponentDependencyNativeLibraryPath(expected.ExcludedNativeLibraryPaths, component)
 .And.HaveReadRidGraph(setup.ShouldUseRidGraph)
 .And.HaveUsedFallbackRid(setup.ShouldUseFallbackRid)
 .And.NotHaveUsedFrameworkProbe(dotnet.GreatestVersionSharedFxPath);

 if (setup.ShouldUseFallbackRid.HasValue)
 result.Should().HaveUsedFallbackRid(setup.ShouldUseFallbackRid.Value);
 }
 }

Expand DownExpand Up@@ -723,16 +743,18 @@ protected override void RunTest(

 app = UpdateAppConfigForTest(app, setup, copyOnUpdate: true);

 SharedState.RunComponentResolutionTest(component.AppDll, app, app.Location, command => command
 .RuntimeId(setup.Rid))
.Should().Pass()
var result = SharedState.RunComponentResolutionTest(component.AppDll, app, app.Location, command => command
 .RuntimeId(setup.Rid));
result.Should().Pass()
 .And.HaveSuccessfullyResolvedComponentDependencies()
 .And.HaveResolvedComponentDependencyAssembly(expected.IncludedAssemblyPaths, component)
 .And.NotHaveResolvedComponentDependencyAssembly(expected.ExcludedAssemblyPaths, component)
 .And.HaveResolvedComponentDependencyNativeLibraryPath(expected.IncludedNativeLibraryPaths, component)
 .And.NotHaveResolvedComponentDependencyNativeLibraryPath(expected.ExcludedNativeLibraryPaths, component)
 .And.HaveReadRidGraph(setup.ShouldUseRidGraph)
 .And.HaveUsedFallbackRid(setup.ShouldUseFallbackRid);
 .And.HaveReadRidGraph(setup.ShouldUseRidGraph);

 if (setup.ShouldUseFallbackRid.HasValue)
 result.Should().HaveUsedFallbackRid(setup.ShouldUseFallbackRid.Value);
 }

 public class ComponentSharedTestState : ComponentSharedTestStateBase
Expand Down

, '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
Stop skipping tests in installer pipeline on linux_x64#89953

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

 Merged

elinor-fung
merged 3 commits into

from

Aug 18, 2023
 Merged


Stop skipping tests in installer pipeline on linux_x64
#89953
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
1d20cfc

Stop skipping tests on Linux_x64


elinor-fung Aug 3, 2023
1200ae2

Fix uploading of binaries/symbols on failure


elinor-fung Aug 3, 2023
5649154

Update test


elinor-fung Aug 3, 2023

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


13 changes: 11 additions & 2 deletions
eng/pipelines/installer/jobs/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,18 +86,26 @@ jobs:
 - name: OfficialBuildArg
 value: ''

 # Explicitly enable tests for linux even though it is a cross build using mariner
 # They still work in this configuration and until they run on Helix, it is our only
 # linux test coverage in the installer pipeline
 - name: SkipTests
 value: ${{ or(
 not(in(parameters.archType, 'x64', 'x86')),
 eq(parameters.runtimeFlavor, 'mono'),
 eq(parameters.isOfficialBuild, true),
 eq(parameters.crossBuild, true),
 and(
 eq(parameters.crossBuild, true),
 not(and(
 eq(parameters.osGroup, 'linux'),
 eq(parameters.osSubgroup, ''))
 )),
 eq(parameters.pgoType, 'PGO')) }}

 - name: BuildAction
 value: -test

 - ${{ if eq(or(not(in(parameters.archType, 'x64', 'x86')), eq(parameters.runtimeFlavor, 'mono'), eq(parameters.isOfficialBuild, true), eq(parameters.crossBuild, true), eq(parameters.pgoType, 'PGO')), true) }}:
 - ${{ if eq(or(not(in(parameters.archType, 'x64', 'x86')), eq(parameters.runtimeFlavor, 'mono'), eq(parameters.isOfficialBuild, true), and(eq(parameters.crossBuild, true), not(and(eq(parameters.osGroup, 'linux'), eq(parameters.osSubgroup, '')))), eq(parameters.pgoType, 'PGO')), true) }}:
 - name: BuildAction
 value: ''

Expand DownExpand Up@@ -378,6 +386,7 @@ jobs:
 runtimeVariant: ${{ parameters.runtimeVariant }}
 isOfficialBuild: ${{ eq(parameters.isOfficialBuild, true) }}
 pgoType: ${{ parameters.pgoType }}
 skipTests: ${{ eq(variables.SkipTests, true) }}

 - ${{ if ne(parameters.osGroup, 'windows') }}:
 - script: set -x && df -h
Expand Down

50 changes: 36 additions & 14 deletions
src/installer/tests/HostActivation.Tests/DependencyResolution/RidAssetResolution.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,23 @@ public class TestSetup

 // Expected behaviour of the test based on above settings
 public bool ShouldUseRidGraph => UseRidGraph == true;
 public bool ShouldUseFallbackRid => ShouldUseRidGraph && (Rid == UnknownRid || !HasRidGraph);

 public bool? ShouldUseFallbackRid
 {
 get
 {
 if (!ShouldUseRidGraph)
 return false;

 if (Rid == UnknownRid || !HasRidGraph)
 return true;

 // We use the product RID graph for testing (for cases with a RID graph). If the test is running
 // on a platform that isn't in that RID graph, we may end up with the fallback even when the RID
 // graph is used and RID is not unknown. Value of null indicates this state.
 return null;
 }
 }

 public override string ToString() => $"""
 {nameof(Rid)}: {(Rid ?? "<null>")}
Expand DownExpand Up@@ -623,18 +639,20 @@ protected override void RunTest(

 UpdateAppConfigForTest(app, setup, copyOnUpdate: false);

 dotnet.Exec(app.AppDll)
var result = dotnet.Exec(app.AppDll)
 .EnableTracingAndCaptureOutputs()
 .RuntimeId(setup.Rid)
 .Execute()
.Should().Pass()
 .Execute();
result.Should().Pass()
 .And.HaveResolvedAssembly(expected.IncludedAssemblyPaths, app)
 .And.NotHaveResolvedAssembly(expected.ExcludedAssemblyPaths, app)
 .And.HaveResolvedNativeLibraryPath(expected.IncludedNativeLibraryPaths, app)
 .And.NotHaveResolvedNativeLibraryPath(expected.ExcludedNativeLibraryPaths, app)
 .And.HaveReadRidGraph(setup.ShouldUseRidGraph)
 .And.HaveUsedFallbackRid(setup.ShouldUseFallbackRid)
 .And.HaveUsedFrameworkProbe(dotnet.GreatestVersionSharedFxPath, level: 1);

 if (setup.ShouldUseFallbackRid.HasValue)
 result.Should().HaveUsedFallbackRid(setup.ShouldUseFallbackRid.Value);
 }
 }
 }
Expand DownExpand Up@@ -674,17 +692,19 @@ protected override void RunTest(

 TestApp app = UpdateAppConfigForTest(SharedState.FrameworkReferenceApp, setup, copyOnUpdate: true);

 SharedState.RunComponentResolutionTest(component.AppDll, app, dotnet.GreatestVersionHostFxrPath, command => command
 .RuntimeId(setup.Rid))
.Should().Pass()
var result = SharedState.RunComponentResolutionTest(component.AppDll, app, dotnet.GreatestVersionHostFxrPath, command => command
 .RuntimeId(setup.Rid));
result.Should().Pass()
 .And.HaveSuccessfullyResolvedComponentDependencies()
 .And.HaveResolvedComponentDependencyAssembly(expected.IncludedAssemblyPaths, component)
 .And.NotHaveResolvedComponentDependencyAssembly(expected.ExcludedAssemblyPaths, component)
 .And.HaveResolvedComponentDependencyNativeLibraryPath(expected.IncludedNativeLibraryPaths, component)
 .And.NotHaveResolvedComponentDependencyNativeLibraryPath(expected.ExcludedNativeLibraryPaths, component)
 .And.HaveReadRidGraph(setup.ShouldUseRidGraph)
 .And.HaveUsedFallbackRid(setup.ShouldUseFallbackRid)
 .And.NotHaveUsedFrameworkProbe(dotnet.GreatestVersionSharedFxPath);

 if (setup.ShouldUseFallbackRid.HasValue)
 result.Should().HaveUsedFallbackRid(setup.ShouldUseFallbackRid.Value);
 }
 }

Expand DownExpand Up@@ -723,16 +743,18 @@ protected override void RunTest(

 app = UpdateAppConfigForTest(app, setup, copyOnUpdate: true);

 SharedState.RunComponentResolutionTest(component.AppDll, app, app.Location, command => command
 .RuntimeId(setup.Rid))
.Should().Pass()
var result = SharedState.RunComponentResolutionTest(component.AppDll, app, app.Location, command => command
 .RuntimeId(setup.Rid));
result.Should().Pass()
 .And.HaveSuccessfullyResolvedComponentDependencies()
 .And.HaveResolvedComponentDependencyAssembly(expected.IncludedAssemblyPaths, component)
 .And.NotHaveResolvedComponentDependencyAssembly(expected.ExcludedAssemblyPaths, component)
 .And.HaveResolvedComponentDependencyNativeLibraryPath(expected.IncludedNativeLibraryPaths, component)
 .And.NotHaveResolvedComponentDependencyNativeLibraryPath(expected.ExcludedNativeLibraryPaths, component)
 .And.HaveReadRidGraph(setup.ShouldUseRidGraph)
 .And.HaveUsedFallbackRid(setup.ShouldUseFallbackRid);
 .And.HaveReadRidGraph(setup.ShouldUseRidGraph);

 if (setup.ShouldUseFallbackRid.HasValue)
 result.Should().HaveUsedFallbackRid(setup.ShouldUseFallbackRid.Value);
 }

 public class ComponentSharedTestState : ComponentSharedTestStateBase
Expand Down

, '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
Stop skipping tests in installer pipeline on linux_x64#89953

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

 Merged

elinor-fung
merged 3 commits into

from

Aug 18, 2023
 Merged


Stop skipping tests in installer pipeline on linux_x64
#89953
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
1d20cfc

Stop skipping tests on Linux_x64


elinor-fung Aug 3, 2023
1200ae2

Fix uploading of binaries/symbols on failure


elinor-fung Aug 3, 2023
5649154

Update test


elinor-fung Aug 3, 2023

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


13 changes: 11 additions & 2 deletions
eng/pipelines/installer/jobs/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,18 +86,26 @@ jobs:
 - name: OfficialBuildArg
 value: ''

 # Explicitly enable tests for linux even though it is a cross build using mariner
 # They still work in this configuration and until they run on Helix, it is our only
 # linux test coverage in the installer pipeline
 - name: SkipTests
 value: ${{ or(
 not(in(parameters.archType, 'x64', 'x86')),
 eq(parameters.runtimeFlavor, 'mono'),
 eq(parameters.isOfficialBuild, true),
 eq(parameters.crossBuild, true),
 and(
 eq(parameters.crossBuild, true),
 not(and(
 eq(parameters.osGroup, 'linux'),
 eq(parameters.osSubgroup, ''))
 )),
 eq(parameters.pgoType, 'PGO')) }}

 - name: BuildAction
 value: -test

 - ${{ if eq(or(not(in(parameters.archType, 'x64', 'x86')), eq(parameters.runtimeFlavor, 'mono'), eq(parameters.isOfficialBuild, true), eq(parameters.crossBuild, true), eq(parameters.pgoType, 'PGO')), true) }}:
 - ${{ if eq(or(not(in(parameters.archType, 'x64', 'x86')), eq(parameters.runtimeFlavor, 'mono'), eq(parameters.isOfficialBuild, true), and(eq(parameters.crossBuild, true), not(and(eq(parameters.osGroup, 'linux'), eq(parameters.osSubgroup, '')))), eq(parameters.pgoType, 'PGO')), true) }}:
 - name: BuildAction
 value: ''

Expand DownExpand Up@@ -378,6 +386,7 @@ jobs:
 runtimeVariant: ${{ parameters.runtimeVariant }}
 isOfficialBuild: ${{ eq(parameters.isOfficialBuild, true) }}
 pgoType: ${{ parameters.pgoType }}
 skipTests: ${{ eq(variables.SkipTests, true) }}

 - ${{ if ne(parameters.osGroup, 'windows') }}:
 - script: set -x && df -h
Expand Down

50 changes: 36 additions & 14 deletions
src/installer/tests/HostActivation.Tests/DependencyResolution/RidAssetResolution.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,23 @@ public class TestSetup

 // Expected behaviour of the test based on above settings
 public bool ShouldUseRidGraph => UseRidGraph == true;
 public bool ShouldUseFallbackRid => ShouldUseRidGraph && (Rid == UnknownRid || !HasRidGraph);

 public bool? ShouldUseFallbackRid
 {
 get
 {
 if (!ShouldUseRidGraph)
 return false;

 if (Rid == UnknownRid || !HasRidGraph)
 return true;

 // We use the product RID graph for testing (for cases with a RID graph). If the test is running
 // on a platform that isn't in that RID graph, we may end up with the fallback even when the RID
 // graph is used and RID is not unknown. Value of null indicates this state.
 return null;
 }
 }

 public override string ToString() => $"""
 {nameof(Rid)}: {(Rid ?? "<null>")}
Expand DownExpand Up@@ -623,18 +639,20 @@ protected override void RunTest(

 UpdateAppConfigForTest(app, setup, copyOnUpdate: false);

 dotnet.Exec(app.AppDll)
var result = dotnet.Exec(app.AppDll)
 .EnableTracingAndCaptureOutputs()
 .RuntimeId(setup.Rid)
 .Execute()
.Should().Pass()
 .Execute();
result.Should().Pass()
 .And.HaveResolvedAssembly(expected.IncludedAssemblyPaths, app)
 .And.NotHaveResolvedAssembly(expected.ExcludedAssemblyPaths, app)
 .And.HaveResolvedNativeLibraryPath(expected.IncludedNativeLibraryPaths, app)
 .And.NotHaveResolvedNativeLibraryPath(expected.ExcludedNativeLibraryPaths, app)
 .And.HaveReadRidGraph(setup.ShouldUseRidGraph)
 .And.HaveUsedFallbackRid(setup.ShouldUseFallbackRid)
 .And.HaveUsedFrameworkProbe(dotnet.GreatestVersionSharedFxPath, level: 1);

 if (setup.ShouldUseFallbackRid.HasValue)
 result.Should().HaveUsedFallbackRid(setup.ShouldUseFallbackRid.Value);
 }
 }
 }
Expand DownExpand Up@@ -674,17 +692,19 @@ protected override void RunTest(

 TestApp app = UpdateAppConfigForTest(SharedState.FrameworkReferenceApp, setup, copyOnUpdate: true);

 SharedState.RunComponentResolutionTest(component.AppDll, app, dotnet.GreatestVersionHostFxrPath, command => command
 .RuntimeId(setup.Rid))
.Should().Pass()
var result = SharedState.RunComponentResolutionTest(component.AppDll, app, dotnet.GreatestVersionHostFxrPath, command => command
 .RuntimeId(setup.Rid));
result.Should().Pass()
 .And.HaveSuccessfullyResolvedComponentDependencies()
 .And.HaveResolvedComponentDependencyAssembly(expected.IncludedAssemblyPaths, component)
 .And.NotHaveResolvedComponentDependencyAssembly(expected.ExcludedAssemblyPaths, component)
 .And.HaveResolvedComponentDependencyNativeLibraryPath(expected.IncludedNativeLibraryPaths, component)
 .And.NotHaveResolvedComponentDependencyNativeLibraryPath(expected.ExcludedNativeLibraryPaths, component)
 .And.HaveReadRidGraph(setup.ShouldUseRidGraph)
 .And.HaveUsedFallbackRid(setup.ShouldUseFallbackRid)
 .And.NotHaveUsedFrameworkProbe(dotnet.GreatestVersionSharedFxPath);

 if (setup.ShouldUseFallbackRid.HasValue)
 result.Should().HaveUsedFallbackRid(setup.ShouldUseFallbackRid.Value);
 }
 }

Expand DownExpand Up@@ -723,16 +743,18 @@ protected override void RunTest(

 app = UpdateAppConfigForTest(app, setup, copyOnUpdate: true);

 SharedState.RunComponentResolutionTest(component.AppDll, app, app.Location, command => command
 .RuntimeId(setup.Rid))
.Should().Pass()
var result = SharedState.RunComponentResolutionTest(component.AppDll, app, app.Location, command => command
 .RuntimeId(setup.Rid));
result.Should().Pass()
 .And.HaveSuccessfullyResolvedComponentDependencies()
 .And.HaveResolvedComponentDependencyAssembly(expected.IncludedAssemblyPaths, component)
 .And.NotHaveResolvedComponentDependencyAssembly(expected.ExcludedAssemblyPaths, component)
 .And.HaveResolvedComponentDependencyNativeLibraryPath(expected.IncludedNativeLibraryPaths, component)
 .And.NotHaveResolvedComponentDependencyNativeLibraryPath(expected.ExcludedNativeLibraryPaths, component)
 .And.HaveReadRidGraph(setup.ShouldUseRidGraph)
 .And.HaveUsedFallbackRid(setup.ShouldUseFallbackRid);
 .And.HaveReadRidGraph(setup.ShouldUseRidGraph);

 if (setup.ShouldUseFallbackRid.HasValue)
 result.Should().HaveUsedFallbackRid(setup.ShouldUseFallbackRid.Value);
 }

 public class ComponentSharedTestState : ComponentSharedTestStateBase
Expand Down

, '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
Stop skipping tests in installer pipeline on linux_x64#89953

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

 Merged

elinor-fung
merged 3 commits into

from

Aug 18, 2023
 Merged


Stop skipping tests in installer pipeline on linux_x64
#89953
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
1d20cfc

Stop skipping tests on Linux_x64


elinor-fung Aug 3, 2023
1200ae2

Fix uploading of binaries/symbols on failure


elinor-fung Aug 3, 2023
5649154

Update test


elinor-fung Aug 3, 2023

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


13 changes: 11 additions & 2 deletions
eng/pipelines/installer/jobs/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,18 +86,26 @@ jobs:
 - name: OfficialBuildArg
 value: ''

 # Explicitly enable tests for linux even though it is a cross build using mariner
 # They still work in this configuration and until they run on Helix, it is our only
 # linux test coverage in the installer pipeline
 - name: SkipTests
 value: ${{ or(
 not(in(parameters.archType, 'x64', 'x86')),
 eq(parameters.runtimeFlavor, 'mono'),
 eq(parameters.isOfficialBuild, true),
 eq(parameters.crossBuild, true),
 and(
 eq(parameters.crossBuild, true),
 not(and(
 eq(parameters.osGroup, 'linux'),
 eq(parameters.osSubgroup, ''))
 )),
 eq(parameters.pgoType, 'PGO')) }}

 - name: BuildAction
 value: -test

 - ${{ if eq(or(not(in(parameters.archType, 'x64', 'x86')), eq(parameters.runtimeFlavor, 'mono'), eq(parameters.isOfficialBuild, true), eq(parameters.crossBuild, true), eq(parameters.pgoType, 'PGO')), true) }}:
 - ${{ if eq(or(not(in(parameters.archType, 'x64', 'x86')), eq(parameters.runtimeFlavor, 'mono'), eq(parameters.isOfficialBuild, true), and(eq(parameters.crossBuild, true), not(and(eq(parameters.osGroup, 'linux'), eq(parameters.osSubgroup, '')))), eq(parameters.pgoType, 'PGO')), true) }}:
 - name: BuildAction
 value: ''

Expand DownExpand Up@@ -378,6 +386,7 @@ jobs:
 runtimeVariant: ${{ parameters.runtimeVariant }}
 isOfficialBuild: ${{ eq(parameters.isOfficialBuild, true) }}
 pgoType: ${{ parameters.pgoType }}
 skipTests: ${{ eq(variables.SkipTests, true) }}

 - ${{ if ne(parameters.osGroup, 'windows') }}:
 - script: set -x && df -h
Expand Down

50 changes: 36 additions & 14 deletions
src/installer/tests/HostActivation.Tests/DependencyResolution/RidAssetResolution.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,23 @@ public class TestSetup

 // Expected behaviour of the test based on above settings
 public bool ShouldUseRidGraph => UseRidGraph == true;
 public bool ShouldUseFallbackRid => ShouldUseRidGraph && (Rid == UnknownRid || !HasRidGraph);

 public bool? ShouldUseFallbackRid
 {
 get
 {
 if (!ShouldUseRidGraph)
 return false;

 if (Rid == UnknownRid || !HasRidGraph)
 return true;

 // We use the product RID graph for testing (for cases with a RID graph). If the test is running
 // on a platform that isn't in that RID graph, we may end up with the fallback even when the RID
 // graph is used and RID is not unknown. Value of null indicates this state.
 return null;
 }
 }

 public override string ToString() => $"""
 {nameof(Rid)}: {(Rid ?? "<null>")}
Expand DownExpand Up@@ -623,18 +639,20 @@ protected override void RunTest(

 UpdateAppConfigForTest(app, setup, copyOnUpdate: false);

 dotnet.Exec(app.AppDll)
var result = dotnet.Exec(app.AppDll)
 .EnableTracingAndCaptureOutputs()
 .RuntimeId(setup.Rid)
 .Execute()
.Should().Pass()
 .Execute();
result.Should().Pass()
 .And.HaveResolvedAssembly(expected.IncludedAssemblyPaths, app)
 .And.NotHaveResolvedAssembly(expected.ExcludedAssemblyPaths, app)
 .And.HaveResolvedNativeLibraryPath(expected.IncludedNativeLibraryPaths, app)
 .And.NotHaveResolvedNativeLibraryPath(expected.ExcludedNativeLibraryPaths, app)
 .And.HaveReadRidGraph(setup.ShouldUseRidGraph)
 .And.HaveUsedFallbackRid(setup.ShouldUseFallbackRid)
 .And.HaveUsedFrameworkProbe(dotnet.GreatestVersionSharedFxPath, level: 1);

 if (setup.ShouldUseFallbackRid.HasValue)
 result.Should().HaveUsedFallbackRid(setup.ShouldUseFallbackRid.Value);
 }
 }
 }
Expand DownExpand Up@@ -674,17 +692,19 @@ protected override void RunTest(

 TestApp app = UpdateAppConfigForTest(SharedState.FrameworkReferenceApp, setup, copyOnUpdate: true);

 SharedState.RunComponentResolutionTest(component.AppDll, app, dotnet.GreatestVersionHostFxrPath, command => command
 .RuntimeId(setup.Rid))
.Should().Pass()
var result = SharedState.RunComponentResolutionTest(component.AppDll, app, dotnet.GreatestVersionHostFxrPath, command => command
 .RuntimeId(setup.Rid));
result.Should().Pass()
 .And.HaveSuccessfullyResolvedComponentDependencies()
 .And.HaveResolvedComponentDependencyAssembly(expected.IncludedAssemblyPaths, component)
 .And.NotHaveResolvedComponentDependencyAssembly(expected.ExcludedAssemblyPaths, component)
 .And.HaveResolvedComponentDependencyNativeLibraryPath(expected.IncludedNativeLibraryPaths, component)
 .And.NotHaveResolvedComponentDependencyNativeLibraryPath(expected.ExcludedNativeLibraryPaths, component)
 .And.HaveReadRidGraph(setup.ShouldUseRidGraph)
 .And.HaveUsedFallbackRid(setup.ShouldUseFallbackRid)
 .And.NotHaveUsedFrameworkProbe(dotnet.GreatestVersionSharedFxPath);

 if (setup.ShouldUseFallbackRid.HasValue)
 result.Should().HaveUsedFallbackRid(setup.ShouldUseFallbackRid.Value);
 }
 }

Expand DownExpand Up@@ -723,16 +743,18 @@ protected override void RunTest(

 app = UpdateAppConfigForTest(app, setup, copyOnUpdate: true);

 SharedState.RunComponentResolutionTest(component.AppDll, app, app.Location, command => command
 .RuntimeId(setup.Rid))
.Should().Pass()
var result = SharedState.RunComponentResolutionTest(component.AppDll, app, app.Location, command => command
 .RuntimeId(setup.Rid));
result.Should().Pass()
 .And.HaveSuccessfullyResolvedComponentDependencies()
 .And.HaveResolvedComponentDependencyAssembly(expected.IncludedAssemblyPaths, component)
 .And.NotHaveResolvedComponentDependencyAssembly(expected.ExcludedAssemblyPaths, component)
 .And.HaveResolvedComponentDependencyNativeLibraryPath(expected.IncludedNativeLibraryPaths, component)
 .And.NotHaveResolvedComponentDependencyNativeLibraryPath(expected.ExcludedNativeLibraryPaths, component)
 .And.HaveReadRidGraph(setup.ShouldUseRidGraph)
 .And.HaveUsedFallbackRid(setup.ShouldUseFallbackRid);
 .And.HaveReadRidGraph(setup.ShouldUseRidGraph);

 if (setup.ShouldUseFallbackRid.HasValue)
 result.Should().HaveUsedFallbackRid(setup.ShouldUseFallbackRid.Value);
 }

 public class ComponentSharedTestState : ComponentSharedTestStateBase
Expand Down

, '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
Stop skipping tests in installer pipeline on linux_x64#89953

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

 Merged

elinor-fung
merged 3 commits into

from

Aug 18, 2023
 Merged


Stop skipping tests in installer pipeline on linux_x64
#89953
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
1d20cfc

Stop skipping tests on Linux_x64


elinor-fung Aug 3, 2023
1200ae2

Fix uploading of binaries/symbols on failure


elinor-fung Aug 3, 2023
5649154

Update test


elinor-fung Aug 3, 2023

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


13 changes: 11 additions & 2 deletions
eng/pipelines/installer/jobs/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,18 +86,26 @@ jobs:
 - name: OfficialBuildArg
 value: ''

 # Explicitly enable tests for linux even though it is a cross build using mariner
 # They still work in this configuration and until they run on Helix, it is our only
 # linux test coverage in the installer pipeline
 - name: SkipTests
 value: ${{ or(
 not(in(parameters.archType, 'x64', 'x86')),
 eq(parameters.runtimeFlavor, 'mono'),
 eq(parameters.isOfficialBuild, true),
 eq(parameters.crossBuild, true),
 and(
 eq(parameters.crossBuild, true),
 not(and(
 eq(parameters.osGroup, 'linux'),
 eq(parameters.osSubgroup, ''))
 )),
 eq(parameters.pgoType, 'PGO')) }}

 - name: BuildAction
 value: -test

 - ${{ if eq(or(not(in(parameters.archType, 'x64', 'x86')), eq(parameters.runtimeFlavor, 'mono'), eq(parameters.isOfficialBuild, true), eq(parameters.crossBuild, true), eq(parameters.pgoType, 'PGO')), true) }}:
 - ${{ if eq(or(not(in(parameters.archType, 'x64', 'x86')), eq(parameters.runtimeFlavor, 'mono'), eq(parameters.isOfficialBuild, true), and(eq(parameters.crossBuild, true), not(and(eq(parameters.osGroup, 'linux'), eq(parameters.osSubgroup, '')))), eq(parameters.pgoType, 'PGO')), true) }}:
 - name: BuildAction
 value: ''

Expand DownExpand Up@@ -378,6 +386,7 @@ jobs:
 runtimeVariant: ${{ parameters.runtimeVariant }}
 isOfficialBuild: ${{ eq(parameters.isOfficialBuild, true) }}
 pgoType: ${{ parameters.pgoType }}
 skipTests: ${{ eq(variables.SkipTests, true) }}

 - ${{ if ne(parameters.osGroup, 'windows') }}:
 - script: set -x && df -h
Expand Down

50 changes: 36 additions & 14 deletions
src/installer/tests/HostActivation.Tests/DependencyResolution/RidAssetResolution.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,23 @@ public class TestSetup

 // Expected behaviour of the test based on above settings
 public bool ShouldUseRidGraph => UseRidGraph == true;
 public bool ShouldUseFallbackRid => ShouldUseRidGraph && (Rid == UnknownRid || !HasRidGraph);

 public bool? ShouldUseFallbackRid
 {
 get
 {
 if (!ShouldUseRidGraph)
 return false;

 if (Rid == UnknownRid || !HasRidGraph)
 return true;

 // We use the product RID graph for testing (for cases with a RID graph). If the test is running
 // on a platform that isn't in that RID graph, we may end up with the fallback even when the RID
 // graph is used and RID is not unknown. Value of null indicates this state.
 return null;
 }
 }

 public override string ToString() => $"""
 {nameof(Rid)}: {(Rid ?? "<null>")}
Expand DownExpand Up@@ -623,18 +639,20 @@ protected override void RunTest(

 UpdateAppConfigForTest(app, setup, copyOnUpdate: false);

 dotnet.Exec(app.AppDll)
var result = dotnet.Exec(app.AppDll)
 .EnableTracingAndCaptureOutputs()
 .RuntimeId(setup.Rid)
 .Execute()
.Should().Pass()
 .Execute();
result.Should().Pass()
 .And.HaveResolvedAssembly(expected.IncludedAssemblyPaths, app)
 .And.NotHaveResolvedAssembly(expected.ExcludedAssemblyPaths, app)
 .And.HaveResolvedNativeLibraryPath(expected.IncludedNativeLibraryPaths, app)
 .And.NotHaveResolvedNativeLibraryPath(expected.ExcludedNativeLibraryPaths, app)
 .And.HaveReadRidGraph(setup.ShouldUseRidGraph)
 .And.HaveUsedFallbackRid(setup.ShouldUseFallbackRid)
 .And.HaveUsedFrameworkProbe(dotnet.GreatestVersionSharedFxPath, level: 1);

 if (setup.ShouldUseFallbackRid.HasValue)
 result.Should().HaveUsedFallbackRid(setup.ShouldUseFallbackRid.Value);
 }
 }
 }
Expand DownExpand Up@@ -674,17 +692,19 @@ protected override void RunTest(

 TestApp app = UpdateAppConfigForTest(SharedState.FrameworkReferenceApp, setup, copyOnUpdate: true);

 SharedState.RunComponentResolutionTest(component.AppDll, app, dotnet.GreatestVersionHostFxrPath, command => command
 .RuntimeId(setup.Rid))
.Should().Pass()
var result = SharedState.RunComponentResolutionTest(component.AppDll, app, dotnet.GreatestVersionHostFxrPath, command => command
 .RuntimeId(setup.Rid));
result.Should().Pass()
 .And.HaveSuccessfullyResolvedComponentDependencies()
 .And.HaveResolvedComponentDependencyAssembly(expected.IncludedAssemblyPaths, component)
 .And.NotHaveResolvedComponentDependencyAssembly(expected.ExcludedAssemblyPaths, component)
 .And.HaveResolvedComponentDependencyNativeLibraryPath(expected.IncludedNativeLibraryPaths, component)
 .And.NotHaveResolvedComponentDependencyNativeLibraryPath(expected.ExcludedNativeLibraryPaths, component)
 .And.HaveReadRidGraph(setup.ShouldUseRidGraph)
 .And.HaveUsedFallbackRid(setup.ShouldUseFallbackRid)
 .And.NotHaveUsedFrameworkProbe(dotnet.GreatestVersionSharedFxPath);

 if (setup.ShouldUseFallbackRid.HasValue)
 result.Should().HaveUsedFallbackRid(setup.ShouldUseFallbackRid.Value);
 }
 }

Expand DownExpand Up@@ -723,16 +743,18 @@ protected override void RunTest(

 app = UpdateAppConfigForTest(app, setup, copyOnUpdate: true);

 SharedState.RunComponentResolutionTest(component.AppDll, app, app.Location, command => command
 .RuntimeId(setup.Rid))
.Should().Pass()
var result = SharedState.RunComponentResolutionTest(component.AppDll, app, app.Location, command => command
 .RuntimeId(setup.Rid));
result.Should().Pass()
 .And.HaveSuccessfullyResolvedComponentDependencies()
 .And.HaveResolvedComponentDependencyAssembly(expected.IncludedAssemblyPaths, component)
 .And.NotHaveResolvedComponentDependencyAssembly(expected.ExcludedAssemblyPaths, component)
 .And.HaveResolvedComponentDependencyNativeLibraryPath(expected.IncludedNativeLibraryPaths, component)
 .And.NotHaveResolvedComponentDependencyNativeLibraryPath(expected.ExcludedNativeLibraryPaths, component)
 .And.HaveReadRidGraph(setup.ShouldUseRidGraph)
 .And.HaveUsedFallbackRid(setup.ShouldUseFallbackRid);
 .And.HaveReadRidGraph(setup.ShouldUseRidGraph);

 if (setup.ShouldUseFallbackRid.HasValue)
 result.Should().HaveUsedFallbackRid(setup.ShouldUseFallbackRid.Value);
 }

 public class ComponentSharedTestState : ComponentSharedTestStateBase
Expand Down

, '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
Stop skipping tests in installer pipeline on linux_x64#89953

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

 Merged

elinor-fung
merged 3 commits into

from

Aug 18, 2023
 Merged


Stop skipping tests in installer pipeline on linux_x64
#89953
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
1d20cfc

Stop skipping tests on Linux_x64


elinor-fung Aug 3, 2023
1200ae2

Fix uploading of binaries/symbols on failure


elinor-fung Aug 3, 2023
5649154

Update test


elinor-fung Aug 3, 2023

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


13 changes: 11 additions & 2 deletions
eng/pipelines/installer/jobs/build-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,18 +86,26 @@ jobs:
 - name: OfficialBuildArg
 value: ''

 # Explicitly enable tests for linux even though it is a cross build using mariner
 # They still work in this configuration and until they run on Helix, it is our only
 # linux test coverage in the installer pipeline
 - name: SkipTests
 value: ${{ or(
 not(in(parameters.archType, 'x64', 'x86')),
 eq(parameters.runtimeFlavor, 'mono'),
 eq(parameters.isOfficialBuild, true),
 eq(parameters.crossBuild, true),
 and(
 eq(parameters.crossBuild, true),
 not(and(
 eq(parameters.osGroup, 'linux'),
 eq(parameters.osSubgroup, ''))
 )),
 eq(parameters.pgoType, 'PGO')) }}

 - name: BuildAction
 value: -test

 - ${{ if eq(or(not(in(parameters.archType, 'x64', 'x86')), eq(parameters.runtimeFlavor, 'mono'), eq(parameters.isOfficialBuild, true), eq(parameters.crossBuild, true), eq(parameters.pgoType, 'PGO')), true) }}:
 - ${{ if eq(or(not(in(parameters.archType, 'x64', 'x86')), eq(parameters.runtimeFlavor, 'mono'), eq(parameters.isOfficialBuild, true), and(eq(parameters.crossBuild, true), not(and(eq(parameters.osGroup, 'linux'), eq(parameters.osSubgroup, '')))), eq(parameters.pgoType, 'PGO')), true) }}:
 - name: BuildAction
 value: ''

Expand DownExpand Up@@ -378,6 +386,7 @@ jobs:
 runtimeVariant: ${{ parameters.runtimeVariant }}
 isOfficialBuild: ${{ eq(parameters.isOfficialBuild, true) }}
 pgoType: ${{ parameters.pgoType }}
 skipTests: ${{ eq(variables.SkipTests, true) }}

 - ${{ if ne(parameters.osGroup, 'windows') }}:
 - script: set -x && df -h
Expand Down

50 changes: 36 additions & 14 deletions
src/installer/tests/HostActivation.Tests/DependencyResolution/RidAssetResolution.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,23 @@ public class TestSetup

 // Expected behaviour of the test based on above settings
 public bool ShouldUseRidGraph => UseRidGraph == true;
 public bool ShouldUseFallbackRid => ShouldUseRidGraph && (Rid == UnknownRid || !HasRidGraph);

 public bool? ShouldUseFallbackRid
 {
 get
 {
 if (!ShouldUseRidGraph)
 return false;

 if (Rid == UnknownRid || !HasRidGraph)
 return true;

 // We use the product RID graph for testing (for cases with a RID graph). If the test is running
 // on a platform that isn't in that RID graph, we may end up with the fallback even when the RID
 // graph is used and RID is not unknown. Value of null indicates this state.
 return null;
 }
 }

 public override string ToString() => $"""
 {nameof(Rid)}: {(Rid ?? "<null>")}
Expand DownExpand Up@@ -623,18 +639,20 @@ protected override void RunTest(

 UpdateAppConfigForTest(app, setup, copyOnUpdate: false);

 dotnet.Exec(app.AppDll)
var result = dotnet.Exec(app.AppDll)
 .EnableTracingAndCaptureOutputs()
 .RuntimeId(setup.Rid)
 .Execute()
.Should().Pass()
 .Execute();
result.Should().Pass()
 .And.HaveResolvedAssembly(expected.IncludedAssemblyPaths, app)
 .And.NotHaveResolvedAssembly(expected.ExcludedAssemblyPaths, app)
 .And.HaveResolvedNativeLibraryPath(expected.IncludedNativeLibraryPaths, app)
 .And.NotHaveResolvedNativeLibraryPath(expected.ExcludedNativeLibraryPaths, app)
 .And.HaveReadRidGraph(setup.ShouldUseRidGraph)
 .And.HaveUsedFallbackRid(setup.ShouldUseFallbackRid)
 .And.HaveUsedFrameworkProbe(dotnet.GreatestVersionSharedFxPath, level: 1);

 if (setup.ShouldUseFallbackRid.HasValue)
 result.Should().HaveUsedFallbackRid(setup.ShouldUseFallbackRid.Value);
 }
 }
 }
Expand DownExpand Up@@ -674,17 +692,19 @@ protected override void RunTest(

 TestApp app = UpdateAppConfigForTest(SharedState.FrameworkReferenceApp, setup, copyOnUpdate: true);

 SharedState.RunComponentResolutionTest(component.AppDll, app, dotnet.GreatestVersionHostFxrPath, command => command
 .RuntimeId(setup.Rid))
.Should().Pass()
var result = SharedState.RunComponentResolutionTest(component.AppDll, app, dotnet.GreatestVersionHostFxrPath, command => command
 .RuntimeId(setup.Rid));
result.Should().Pass()
 .And.HaveSuccessfullyResolvedComponentDependencies()
 .And.HaveResolvedComponentDependencyAssembly(expected.IncludedAssemblyPaths, component)
 .And.NotHaveResolvedComponentDependencyAssembly(expected.ExcludedAssemblyPaths, component)
 .And.HaveResolvedComponentDependencyNativeLibraryPath(expected.IncludedNativeLibraryPaths, component)
 .And.NotHaveResolvedComponentDependencyNativeLibraryPath(expected.ExcludedNativeLibraryPaths, component)
 .And.HaveReadRidGraph(setup.ShouldUseRidGraph)
 .And.HaveUsedFallbackRid(setup.ShouldUseFallbackRid)
 .And.NotHaveUsedFrameworkProbe(dotnet.GreatestVersionSharedFxPath);

 if (setup.ShouldUseFallbackRid.HasValue)
 result.Should().HaveUsedFallbackRid(setup.ShouldUseFallbackRid.Value);
 }
 }

Expand DownExpand Up@@ -723,16 +743,18 @@ protected override void RunTest(

 app = UpdateAppConfigForTest(app, setup, copyOnUpdate: true);

 SharedState.RunComponentResolutionTest(component.AppDll, app, app.Location, command => command
 .RuntimeId(setup.Rid))
.Should().Pass()
var result = SharedState.RunComponentResolutionTest(component.AppDll, app, app.Location, command => command
 .RuntimeId(setup.Rid));
result.Should().Pass()
 .And.HaveSuccessfullyResolvedComponentDependencies()
 .And.HaveResolvedComponentDependencyAssembly(expected.IncludedAssemblyPaths, component)
 .And.NotHaveResolvedComponentDependencyAssembly(expected.ExcludedAssemblyPaths, component)
 .And.HaveResolvedComponentDependencyNativeLibraryPath(expected.IncludedNativeLibraryPaths, component)
 .And.NotHaveResolvedComponentDependencyNativeLibraryPath(expected.ExcludedNativeLibraryPaths, component)
 .And.HaveReadRidGraph(setup.ShouldUseRidGraph)
 .And.HaveUsedFallbackRid(setup.ShouldUseFallbackRid);
 .And.HaveReadRidGraph(setup.ShouldUseRidGraph);

 if (setup.ShouldUseFallbackRid.HasValue)
 result.Should().HaveUsedFallbackRid(setup.ShouldUseFallbackRid.Value);
 }

 public class ComponentSharedTestState : ComponentSharedTestStateBase
Expand Down