huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Enabling CoreCLR tests on Travis

This commit is contained in:
Pranav K 2015-12-03 09:16:00 -08:00
parent 96de1dbe4b
commit 3a7c9c73ed
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -13,7 +13,7 @@ addons:
before_install: before_install:
- if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install icu4c; fi - if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install icu4c; fi
env: env:
- KOREBUILD_DNU_RESTORE_CORECLR=true MONO_THREADS_PER_CPU=2000 MONO_MANAGED_WATCHER=disabled - KOREBUILD_DNU_RESTORE_CORECLR=true MONO_THREADS_PER_CPU=2000 MONO_MANAGED_WATCHER=disabled KOREBUILD_TEST_DNXCORE=true NO_PARALLEL_TEST_PROJECTS=Microsoft.AspNet.Mvc.FunctionalTests
mono: mono:
- 4.0.5 - 4.0.5
os: os:

4
test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorHostTest.cs
View File

@ -34,8 +34,8 @@ namespace Microsoft.AspNet.Mvc.Razor
{ {
var data = new TheoryData<string> { "//" }; var data = new TheoryData<string> { "//" };
// The following scenarios are not relevant in Mono. // The following scenarios are only relevant on Windows.
if (!TestPlatformHelper.IsMono) if (TestPlatformHelper.IsWindows)
{ {
data.Add("C:/"); data.Add("C:/");
data.Add(@"\\"); data.Add(@"\\");

7
test/Microsoft.AspNet.Mvc.Razor.Test/LanguageViewLocationExpanderTest.cs
View File

@ -2,6 +2,7 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Collections.Generic; using System.Collections.Generic;
using Microsoft.AspNet.Testing.xunit;
using Xunit; using Xunit;
namespace Microsoft.AspNet.Mvc.Razor namespace Microsoft.AspNet.Mvc.Razor
@ -173,7 +174,11 @@ namespace Microsoft.AspNet.Mvc.Razor
Assert.Equal(viewLocations, expandedViewLocations); Assert.Equal(viewLocations, expandedViewLocations);
} }
[Theory] [ConditionalTheory]
[OSSkipCondition(OperatingSystems.Linux,
SkipReason = "Invalid culture detection is OS-specific")]
[OSSkipCondition(OperatingSystems.MacOSX,
SkipReason = "Invalid culture detection is OS-specific")]
[MemberData(nameof(ViewLocationExpanderTestData))] [MemberData(nameof(ViewLocationExpanderTestData))]
public void ExpandViewLocations_IncorrectLocaleContextValue(IEnumerable<string> viewLocations) public void ExpandViewLocations_IncorrectLocaleContextValue(IEnumerable<string> viewLocations)
{ {