diff options
| author | Egor Chesakov <Egor.Chesakov@microsoft.com> | 2018-12-10 16:53:40 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-10 16:53:40 -0800 |
| commit | 86ae71ac96ed44399de26bad3542fc5ddc04bbf9 (patch) | |
| tree | a30bf82b16618be7bb64a184b0e753d09c198ae3 /tests | |
| parent | 9084476de3173deaf3c2c39549411fa55f500f72 (diff) | |
| download | coreclr-86ae71ac96ed44399de26bad3542fc5ddc04bbf9.tar.gz coreclr-86ae71ac96ed44399de26bad3542fc5ddc04bbf9.tar.bz2 coreclr-86ae71ac96ed44399de26bad3542fc5ddc04bbf9.zip | |
Specify HelixTargetQueues in yaml (#21443)
* Parametrize test-job with helixQueues(Public|Internal) in eng/test-job.yml and specify them in eng/platform-matrix.yml
* Remove HelixTargetQueues property in tests/helixpublishwitharcade.proj
* Fix the error "unknown os: linux2" with Python script
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/helixpublishwitharcade.proj | 25 | ||||
| -rwxr-xr-x | tests/runtest_helix.py | 2 |
2 files changed, 1 insertions, 26 deletions
diff --git a/tests/helixpublishwitharcade.proj b/tests/helixpublishwitharcade.proj index 50d7818f17..d4799690ca 100644 --- a/tests/helixpublishwitharcade.proj +++ b/tests/helixpublishwitharcade.proj @@ -12,31 +12,6 @@ <HelixType>test/stuff</HelixType> <HelixBuild>$(BUILD_BUILDNUMBER)</HelixBuild> - <!-- TODO: add target queues for rhel and linux-musl --> - <!-- TODO: why don't we currently run tests on windows x86? --> - <HelixTargetQueues Condition=" '$(BuildOS)' == 'Windows_NT' "> - Windows.10.Amd64; - Windows.10.Nano.Amd64; - Windows.10.Amd64.Core; - Windows.7.Amd64; - Windows.81.Amd64 - </HelixTargetQueues> - <HelixTargetQueues Condition=" '$(BuildOS)' == 'Linux' "> - debian.82.amd64; - fedora.27.amd64; - fedora.28.amd64; - redhat.73.amd64; - ubuntu.1404.amd64; - ubuntu.1604.amd64; - ubuntu.1804.amd64; - opensuse.423.amd64; - sles.12.amd64 - </HelixTargetQueues> - <HelixTargetQueues Condition=" '$(BuildOS)' == 'OSX' "> - osx.1012.amd64; - osx.1013.amd64 - </HelixTargetQueues> - <EnableXUnitReporter>true</EnableXUnitReporter> <WaitForWorkItemCompletion>true</WaitForWorkItemCompletion> <SourceDirectory>$(MSBuildProjectDirectory)/..</SourceDirectory> diff --git a/tests/runtest_helix.py b/tests/runtest_helix.py index 910d9d77ce..10ef1a4853 100755 --- a/tests/runtest_helix.py +++ b/tests/runtest_helix.py @@ -22,7 +22,7 @@ test_scenarios = { "COMPlus_JitStress": "2" }, } -if sys.platform == "linux" or sys.platform == "darwin": +if sys.platform.startswith('linux') or sys.platform == "darwin": platform_type = "unix" elif sys.platform == "win32": platform_type = "windows" |