diff options
author | Eric St. John <ericstj@microsoft.com> | 2016-05-25 01:41:40 +0300 |
---|---|---|
committer | Eric St. John <ericstj@microsoft.com> | 2016-05-25 07:49:17 +0300 |
commit | 7ba4d296e3e0a2445ffa708c1e918d90d2bac69c (patch) | |
tree | 75de16409c31c2fce53d0cb5c4ca9486066ef9d3 /Documentation | |
parent | 6f53b750ad55f74091950b58b84320f9110ce24f (diff) |
Update tests to use NETCoreApp1.0 moniker
Requires https://github.com/dotnet/buildtools/pull/751
This makes all the tests resolve using NETCoreApp1.0 instead of
DNXCore50. I've removed the netstandard1.6 import since that is no
longer needed. I've also removed the workarounds from tests that were
targeting netcoreapp1.0 on their own. For restore compat I've added an
DNXCore50 import to every test project. These can be removed once
test-runtime packages are updated to target NETCoreApp1.0.
I've updated all the test scripts which were assuming DNXCore50 as well
as docs which referred to this path.
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/building/windows-instructions.md | 2 | ||||
-rw-r--r-- | Documentation/debugging/windows-instructions.md | 6 | ||||
-rw-r--r-- | Documentation/project-docs/performance-tests.md | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/building/windows-instructions.md b/Documentation/building/windows-instructions.md index b2bd9f3470..7a710990e5 100644 --- a/Documentation/building/windows-instructions.md +++ b/Documentation/building/windows-instructions.md @@ -135,7 +135,7 @@ xunit.console.netcore.exe *.dll -notrait category=nonosxtests -trait category=Ou xunit.console.netcore.exe *.dll -notrait category=nonlinuxtests -trait category=failing ``` -All the required dlls to run a test project can be found in `bin\tests\{Configration}\{Project}.Tests\dnxcore50\` which should be created when the test project is built. +All the required dlls to run a test project can be found in `bin\tests\{Configration}\{Project}.Tests\netcoreapp1.0\` which should be created when the test project is built. ### Running tests from Visual Studio diff --git a/Documentation/debugging/windows-instructions.md b/Documentation/debugging/windows-instructions.md index 20b17438b3..7e276d9796 100644 --- a/Documentation/debugging/windows-instructions.md +++ b/Documentation/debugging/windows-instructions.md @@ -41,15 +41,15 @@ To run a single test from command line: * Locate the test binary folder based on the CSPROJ name. -For example: `src\System.Net.Sockets\tests\Functional\System.Net.Sockets.Tests.csproj` will build and output binaries at `bin\tests\Windows_NT.AnyCPU.Debug\System.Net.Sockets.Tests\dnxcore50`. +For example: `src\System.Net.Sockets\tests\Functional\System.Net.Sockets.Tests.csproj` will build and output binaries at `bin\tests\Windows_NT.AnyCPU.Debug\System.Net.Sockets.Tests\netcoreapp1.0`. * Execute the test Assuming that your repo is at `C:\corefx`: ``` -cd C:\corefx\bin\tests\Windows_NT.AnyCPU.Debug\System.Net.Sockets.Tests\dnxcore50 -C:\corefx\bin\tests\Windows_NT.AnyCPU.Debug\System.Net.Sockets.Tests\dnxcore50\CoreRun.exe xunit.console.netcore.exe System.Net.Sockets.Tests.dll -xml testResults.xml -notrait category=nonwindowstests -notrait category=OuterLoop -notrait category=failing +cd C:\corefx\bin\tests\Windows_NT.AnyCPU.Debug\System.Net.Sockets.Tests\netcoreapp1.0 +C:\corefx\bin\tests\Windows_NT.AnyCPU.Debug\System.Net.Sockets.Tests\netcoreapp1.0\CoreRun.exe xunit.console.netcore.exe System.Net.Sockets.Tests.dll -xml testResults.xml -notrait category=nonwindowstests -notrait category=OuterLoop -notrait category=failing ``` * If the test crashes or encounteres a `Debugger.Launch()` method call, WinDBG will automatically start and attach to the `CoreRun.exe` process diff --git a/Documentation/project-docs/performance-tests.md b/Documentation/project-docs/performance-tests.md index f4d5b1ab9f..36f612a106 100644 --- a/Documentation/project-docs/performance-tests.md +++ b/Documentation/project-docs/performance-tests.md @@ -1,4 +1,4 @@ -Performance Tests +Performance Tests ====================== This document contains instructions for building, running, and adding Performance tests. @@ -26,7 +26,7 @@ To build and run the tests using msbuild for a project, run ```msbuild /t:BuildA Note: Because build.cmd runs tests concurrently, it's not recommended that you execute the perf tests using it. -results will be in: corefx/bin/tests/Windows_NT.AnyCPU.Release/TESTNAME/dnxcore50 +results will be in: corefx/bin/tests/Windows_NT.AnyCPU.Release/TESTNAME/netcoreapp1.0 ### Linux From your tests directory, run: ``` |