VSadov/Satori
1
0
Fork 0
mirror of https://github.com/VSadov/Satori.git synced 2025-06-11 18:20:26 +09:00
Code Activity

[mono] Pass category=failing and category=outerloop to Android and iOS (#35665)

Browse source
This commit is contained in:
Egor Bogatov 2020-05-01 17:09:36 +03:00 • committed by GitHub
parent d119c05139
commit 683508940d
Signed by: github
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.config/dotnet-tools.json
View file

@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "1.0.0-prerelease.20227.9",
"version": "1.0.0-prerelease.20230.1",
"commands": [
"xharness"
]

7
eng/testing/tests.targets
View file

@ -156,6 +156,8 @@
<Copy SourceFiles="@(AndroidTestRunnerBinaries)" DestinationFolder="$(BundleDir)\%(RecursiveDir)" SkipUnchangedFiles="true"/>
<Copy SourceFiles="@(BclBinaries)" DestinationFolder="$(BundleDir)\%(RecursiveDir)" SkipUnchangedFiles="true"/>
<WriteLinesToFile File="$(BundleDir)\xunit-excludes.txt" Lines="$(_withoutCategories.Replace(';', '%0dcategory='))" />
<AndroidAppBuilderTask
Abi="$(AndroidAbi)"
ProjectName="$(AssemblyName)"
@ -194,8 +196,6 @@
<!-- remove PDBs to save some space until we integrate ILLink -->
<BclBinaries Remove="$(RuntimePackDir)\lib\$(NetCoreAppCurrent)\*.pdb" />
</ItemGroup>
<Error Condition="$(TargetArchitecture.StartsWith('arm')) and '$(DevTeamProvisioning)' == ''"
Text="'DevTeamProvisioning' shouldn't be empty for arm64" />
<Error Condition="!Exists('$(AppleTestRunner)')" Text="AppleTestRunner=$(AppleTestRunner) doesn't exist" />
<Error Condition="!Exists('$(RuntimePackDir)')" Text="RuntimePackDir=$(RuntimePackDir) doesn't exist" />
<RemoveDir Directories="$(BundleDir)" />
@ -203,6 +203,7 @@
<Copy SourceFiles="@(AppleTestRunnerBinaries)" DestinationFolder="$(BundleDir)\%(RecursiveDir)" SkipUnchangedFiles="true"/>
<Copy SourceFiles="@(BclBinaries)" DestinationFolder="$(BundleDir)\%(RecursiveDir)" SkipUnchangedFiles="true"/>
<WriteLinesToFile File="$(BundleDir)\xunit-excludes.txt" Lines="$(_withoutCategories.Replace(';', '%0dcategory='))" />
<!-- Run App bundler, it should AOT libs (if needed), link all native bits, compile simple UI (written in ObjC)
and produce an app bundle (with xcode project) -->
<AppleAppBuilderTask
@ -225,6 +226,8 @@
</AppleAppBuilderTask>
<Message Importance="High" Text="Xcode: $(XcodeProjectPath)"/>
<Message Importance="High" Text="App: $(AppBundlePath)"/>
<Error Condition="$(TargetArchitecture.StartsWith('arm')) and '$(DevTeamProvisioning)' == ''"
Text="'DevTeamProvisioning' shouldn't be empty for arm64" />
<!-- This app is now can be consumed by xharness CLI to deploy on a device or simulator -->
</Target>

2
src/mono/msbuild/AndroidTestRunner/AndroidTestRunner.cs
View file

@ -65,6 +65,8 @@ public class SimpleAndroidTestRunner : AndroidApplicationEntryPoint, IDevice
protected override string? IgnoreFilesDirectory => null;
protected override string IgnoredTraitsFilePath => "xunit-excludes.txt";
public string BundleIdentifier => "net.dot." + s_MainTestName;
public string? UniqueIdentifier { get; }

2
src/mono/msbuild/AppleTestRunner/AppleTestRunner.cs
View file

@ -128,6 +128,8 @@ public class SimpleTestRunner : iOSApplicationEntryPoint, IDevice
protected override string? IgnoreFilesDirectory => null;
protected override string IgnoredTraitsFilePath => "xunit-excludes.txt";
public string BundleIdentifier => "net.dot." + s_MainTestName;
public string? UniqueIdentifier { get; }