Skip to content

WIP/Monitor: Reenable codedom tests when using Unity (trunk/latest) #1455

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

Open
wants to merge 11 commits into
base: develop
Choose a base branch
from
Open

WIP/Monitor: Reenable codedom tests when using Unity (trunk/latest) #1455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
26832c2
Reenable codedom tests on trunk
ekcoh Nov 3, 2021
7c69f86
Merge branch 'develop' into reenable-codedom-tests
ekcoh Nov 12, 2021
931e374
Attempting to explicitly specify NET_4_8 instead of NET_4_6
ekcoh Nov 15, 2021
1cc508a
Merge branch 'reenable-codedom-tests' of github.com:Unity-Technologie…
ekcoh Nov 15, 2021
1720e7e
Changed netfx devpack version to 4.8
ekcoh Nov 15, 2021
f867e68
Corrected NET arg for 4_8
ekcoh Nov 15, 2021
4c069d6
Merge branch 'develop' into reenable-codedom-tests
ekcoh Dec 13, 2021
e68eef1
Merge branch 'develop' into reenable-codedom-tests
ekcoh Mar 10, 2022
127014b
Merge branch 'develop' into reenable-codedom-tests
ekcoh Apr 5, 2022
757e579
Merge branch 'develop' into reenable-codedom-tests
ekcoh Apr 5, 2022
b2344bf
Merge branch 'reenable-codedom-tests' of github.com:Unity-Technologie…
ekcoh Apr 6, 2022
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
6 changes: 3 additions & 3 deletions .yamato/config.metadata
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@ platforms:
type: Unity::VM
image: package-ci/win10:v1.15.0-713263
flavor: b1.large
netinstall: choco install netfx-4.7.1-devpack -y --ignore-detected-reboot --ignore-package-codes --Source https://bfartifactory.bf.unity3d.com/artifactory/api/nuget/unity-choco-local
netinstall: choco install netfx-4.8-devpack -y --ignore-detected-reboot --ignore-package-codes --Source https://bfartifactory.bf.unity3d.com/artifactory/api/nuget/unity-choco-local
- name: win_standalone
type: Unity::VM
image: package-ci/win10:v1.15.0-713263
flavor: b1.large
runtime: StandaloneWindows64
netinstall: choco install netfx-4.7.1-devpack -y --ignore-detected-reboot --ignore-package-codes --Source https://bfartifactory.bf.unity3d.com/artifactory/api/nuget/unity-choco-local
netinstall: choco install netfx-4.8-devpack -y --ignore-detected-reboot --ignore-package-codes --Source https://bfartifactory.bf.unity3d.com/artifactory/api/nuget/unity-choco-local
- name: win_standalone_il2cpp
type: Unity::VM
image: package-ci/win10:v1.15.0-713263
flavor: b1.large
runtime: StandaloneWindows64
scripting-backend: Il2Cpp
installscript: unity-downloader-cli -c editor -c StandaloneSupport-IL2CPP -w -u
netinstall: choco install netfx-4.7.1-devpack -y --ignore-detected-reboot --ignore-package-codes --Source https://bfartifactory.bf.unity3d.com/artifactory/api/nuget/unity-choco-local
netinstall: choco install netfx-4.8-devpack -y --ignore-detected-reboot --ignore-package-codes --Source https://bfartifactory.bf.unity3d.com/artifactory/api/nuget/unity-choco-local
- name: mac
type: Unity::VM::osx
image: package-ci/mac:stable
Expand Down
2 changes: 1 addition & 1 deletion .yamato/upm-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
- mv ./Packages/com.unity.inputsystem/Samples ./Assets
- mv ./Packages/com.unity.inputsystem/Samples.meta ./Assets
# Now run our full test suite that sits in Assets/Tests by running UTR on our project.
- upm-ci~/tools/utr/utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode --api-profile=NET_4_6 --stdout-filter=minimal {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem
- upm-ci~/tools/utr/utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode --api-profile=NET_UNITY_4_8 --stdout-filter=minimal {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem
artifacts:
UTR_Output.zip:
paths:
Expand Down
4 changes: 0 additions & 4 deletions Assets/Tests/InputSystem/CoreTests_Editor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2183,7 +2183,6 @@ public void Editor_ActionTree_CompositesAreShownWithNiceNames()

#if UNITY_STANDALONE // CodeDom API not available in most players. We only build and run this in the editor but we're
// still affected by the current platform.
#if !TEMP_DISABLE_EDITOR_TESTS_ON_TRUNK // Temporary: Disables tests while net-profile passed from UTR to trunk is overridden to netstandard (missing CodeDom)
[Test]
[Category("Editor")]
[TestCase("MyControls (2)", "MyNamespace", "", "MyNamespace.MyControls2")]
Expand Down Expand Up @@ -2223,7 +2222,6 @@ public void Editor_CanGenerateCodeWrapperForInputAsset(string assetName, string
Assert.That(set1map.ToJson(), Is.EqualTo(map1.ToJson()));
}

#endif
#endif

// Can take any given registered layout and generate a cross-platform C# struct for it
Expand Down Expand Up @@ -2881,7 +2879,6 @@ private void AssertAssetIsUnmodifiedAfterExitingPlayMode(Action<InputActionAsset
}

#if UNITY_STANDALONE // CodeDom API not available in most players.
#if !TEMP_DISABLE_EDITOR_TESTS_ON_TRUNK // Temporary: Disables tests while net-profile passed from UTR to trunk is overridden to netstandard (missing CodeDom)
[Test]
[Category("Editor")]
[TestCase("Mouse", typeof(Mouse))]
Expand Down Expand Up @@ -3088,7 +3085,6 @@ internal static Type Compile(string code, string typeName, string options = null
return type;
}

#endif
#endif

[Test]
Expand Down