diff --git a/docs/coreclr/building/android.md b/docs/coreclr/building/android.md index edcb94eadf6437..987f8121014eb8 100644 --- a/docs/coreclr/building/android.md +++ b/docs/coreclr/building/android.md @@ -32,7 +32,7 @@ To compile for arm64, run: CONFIG_DIR=`realpath cross/android/arm64` ROOTFS_DIR=`realpath cross/android-rootfs/toolchain/arm64/sysroot` ./build.sh cross arm64 skipgenerateversion skipmscorlib cmakeargs -DENABLE_LLDBPLUGIN=0 ``` -The resulting binaries will be found in `bin/Product/Linux.BuildArch.BuildType/` +The resulting binaries will be found in `artifacts/Product/Linux.BuildArch.BuildType/` Running the PAL tests on Android -------------------------------- @@ -42,7 +42,7 @@ You can run the PAL tests on an Android device. To run the tests, you first copy To copy the PAL tests over to an Android phone: ``` -adb push bin/obj/Linux.arm64.Debug/src/pal/tests/palsuite/ /data/local/tmp/coreclr/src/pal/tests/palsuite +adb push artifacts/obj/Linux.arm64.Debug/src/pal/tests/palsuite/ /data/local/tmp/coreclr/src/pal/tests/palsuite adb push cross/android/toolchain/arm64/sysroot/usr/lib/libintl.so /data/local/tmp/coreclr/lib adb push cross/android/toolchain/arm64/sysroot/usr/lib/libandroid-support.so /data/local/tmp/coreclr/lib/ adb push cross/android/toolchain/arm64/sysroot/usr/lib/libandroid-glob.so /data/local/tmp/coreclr/lib/ diff --git a/docs/coreclr/building/cross-building.md b/docs/coreclr/building/cross-building.md index 48b5f0131dae82..dc0b9292a4ded5 100644 --- a/docs/coreclr/building/cross-building.md +++ b/docs/coreclr/building/cross-building.md @@ -101,7 +101,7 @@ And with: ben@ubuntu ~/git/coreclr/ $ ROOTFS_DIR=/home/ben/coreclr-cross/arm ./build.sh arm debug verbose cross -As usual, the resulting binaries will be found in `bin/Product/BuildOS.BuildArch.BuildType/` +As usual, the resulting binaries will be found in `artifacts/Product/BuildOS.BuildArch.BuildType/` Compiling System.Private.CoreLib for ARM Linux @@ -134,11 +134,11 @@ To build System.Private.CoreLib for Linux, run the following command: lgs@ubuntu ~/git/coreclr/ $ build.sh arm debug verbose ``` -The output is at bin/Product/.arm.Debug/System.Private.CoreLib.dll. +The output is at artifacts/Product/.arm.Debug/System.Private.CoreLib.dll. ``` - lgs@ubuntu ~/git/coreclr/ $ file ./bin/Product/Linux.arm.Debug/System.Private.CoreLib.dll - ./bin/Product/Linux.arm.Debug/System.Private.CoreLib.dll: PE32 executable (DLL) + lgs@ubuntu ~/git/coreclr/ $ file ./artifacts/Product/Linux.arm.Debug/System.Private.CoreLib.dll + ./artifacts/Product/Linux.arm.Debug/System.Private.CoreLib.dll: PE32 executable (DLL) (console) ARMv7 Thumb Mono/.NET assembly, for MS Windows ``` @@ -164,21 +164,21 @@ prajwal@ubuntu ~/coreclr $ ./tests/scripts/arm32_ci_script.sh \ --skipTests ``` -The Linux ARM Emulator is based on soft floating point and thus the native binaries in coreclr are built for the armel architecture. The coreclr binaries generated by the above command (native and System.Private.CoreLib) can be found at `~/coreclr/bin/Product/Linux.armel.Release`. +The Linux ARM Emulator is based on soft floating point and thus the native binaries in coreclr are built for the armel architecture. The coreclr binaries generated by the above command (native and System.Private.CoreLib) can be found at `~/coreclr/artifacts/Product/Linux.armel.Release`. To build libcoreclr and System.Private.CoreLib, and run selected coreclr unit tests on the emulator, do the following: -* Download the latest Coreclr unit test binaries (or build on Windows) from here: [Debug](http://dotnet-ci.cloudapp.net/job/dotnet_coreclr/job/master/job/debug_windows_nt_bld/lastSuccessfulBuild/artifact/bin/tests/tests.zip) and [Release](http://dotnet-ci.cloudapp.net/job/dotnet_coreclr/job/master/job/release_windows_nt_bld/lastSuccessfulBuild/artifact/bin/tests/tests.zip). -Setup the binaries at `~/coreclr/bin/tests/Windows_NT.x64.Release`. +* Download the latest Coreclr unit test binaries (or build on Windows) from here: [Debug](http://dotnet-ci.cloudapp.net/job/dotnet_coreclr/job/master/job/debug_windows_nt_bld/lastSuccessfulBuild/artifact/artifacts/tests/tests.zip) and [Release](http://dotnet-ci.cloudapp.net/job/dotnet_coreclr/job/master/job/release_windows_nt_bld/lastSuccessfulBuild/artifact/artifacts/tests/tests.zip). +Setup the binaries at `~/coreclr/artifacts/tests/Windows_NT.x64.Release`. * Build corefx binaries for the Emulator as given [here](https://github.com/dotnet/corefx/blob/master/Documentation/building/cross-building.md#building-corefx-for-linux-arm-emulator). -Setup these binaries at `~/corefx/bin/Linux.arm-softfp.Release`, `~/corefx/bin/Linux.AnyCPU.Release`, `~/corefx/bin/Unix.AnyCPU.Release`, and `~/corefx/bin/AnyOS.AnyCPU.Release`. +Setup these binaries at `~/corefx/artifacts/Linux.arm-softfp.Release`, `~/corefx/artifacts/Linux.AnyCPU.Release`, `~/corefx/artifacts/Unix.AnyCPU.Release`, and `~/corefx/artifacts/AnyOS.AnyCPU.Release`. * Run the following command (change value of `--testDirFile` argument to the file containing your selection of tests): ``` prajwal@ubuntu ~/coreclr $ ./tests/scripts/arm32_ci_script.sh \ --emulatorPath=/opt/linux-arm-emulator \ --mountPath=/opt/linux-arm-emulator-root \ --buildConfig=Release \ - --testRootDir=~/coreclr/bin/tests/Windows_NT.x64.Release \ - --coreFxNativeBinDir=~/corefx/bin/Linux.arm-softfp.Release \ - --coreFxBinDir="~/corefx/bin/Linux.AnyCPU.Release;~/corefx/bin/Unix.AnyCPU.Release;~/corefx/bin/AnyOS.AnyCPU.Release" \ + --testRootDir=~/coreclr/artifacts/tests/Windows_NT.x64.Release \ + --coreFxNativeBinDir=~/corefx/artifacts/Linux.arm-softfp.Release \ + --coreFxBinDir="~/corefx/artifacts/Linux.AnyCPU.Release;~/corefx/artifacts/Unix.AnyCPU.Release;~/corefx/artifacts/AnyOS.AnyCPU.Release" \ --testDirFile=~/coreclr/tests/testsRunningInsideARM.txt ``` diff --git a/docs/coreclr/building/debugging-instructions.md b/docs/coreclr/building/debugging-instructions.md index a3a439649e7766..c84671295f8b26 100644 --- a/docs/coreclr/building/debugging-instructions.md +++ b/docs/coreclr/building/debugging-instructions.md @@ -9,7 +9,7 @@ Debugging CoreCLR on Windows ============================ 1. Perform a build of the repo. -2. Open solution \\bin\obj\Windows_NT.\.\\CoreCLR.sln in Visual Studio. \ and \ are based +2. Open solution \\artifacts\obj\Windows_NT.\.\\CoreCLR.sln in Visual Studio. \ and \ are based on type of build you did. By default they are 'x64' and 'Debug'. 3. Right-click the INSTALL project and choose ‘Set as StartUp Project’ 4. Bring up the properties page for the INSTALL project @@ -39,7 +39,7 @@ Only lldb is supported by SOS. Gdb can be used to debug the coreclr code but wit 1. Perform a build of the coreclr repo. 2. Install the corefx managed assemblies to the binaries directory. -3. cd to build's binaries: `cd ~/coreclr/bin/Product/Linux.x64.Debug` +3. cd to build's binaries: `cd ~/coreclr/artifacts/Product/Linux.x64.Debug` 4. Start lldb: `lldb-3.9 corerun HelloWorld.exe linux` 6. Launch program: `process launch -s` 7. To stop annoying breaks on SIGUSR1/SIGUSR2 signals used by the runtime run: `process handle -s false SIGUSR1 SIGUSR2` diff --git a/docs/coreclr/building/freebsd-instructions.md b/docs/coreclr/building/freebsd-instructions.md index 26afc77b289f47..49c29f49deffea 100644 --- a/docs/coreclr/building/freebsd-instructions.md +++ b/docs/coreclr/building/freebsd-instructions.md @@ -51,7 +51,7 @@ LLDB_LIB_DIR=/usr/local/llvm37/lib LLDB_INCLUDE_DIR=/usr/local/llvm37/include ./ Run tests: ```sh -./src/pal/tests/palsuite/runpaltests.sh $PWD/bin/obj/FreeBSD.x64.Debug $PWD/bin/paltestout +./src/pal/tests/palsuite/runpaltests.sh $PWD/artifacts/obj/FreeBSD.x64.Debug $PWD/artifacts/paltestout ``` Git Setup @@ -78,7 +78,7 @@ janhenke@freebsd-frankfurt:~/git/coreclr % ./build.sh clang3.6 ``` -After the build is completed, there should some files placed in `bin/Product/FreeBSD.x64.Debug`. The ones we are interested in are: +After the build is completed, there should some files placed in `artifacts/Product/FreeBSD.x64.Debug`. The ones we are interested in are: * `corerun`: The command line host. This program loads and starts the CoreCLR runtime and passes the managed program you want to run to it. * `libcoreclr.so`: The CoreCLR runtime itself. @@ -88,8 +88,8 @@ In order to keep everything tidy, let's create a new directory for the runtime a ```sh janhenke@freebsd-frankfurt:~/git/coreclr % mkdir -p ~/coreclr-demo/runtime -janhenke@freebsd-frankfurt:~/git/coreclr % cp bin/Product/FreeBSD.x64.Debug/corerun ~/coreclr-demo/runtime -janhenke@freebsd-frankfurt:~/git/coreclr % cp bin/Product/FreeBSD.x64.Debug/libcoreclr*.so ~/coreclr-demo/runtime +janhenke@freebsd-frankfurt:~/git/coreclr % cp artifacts/Product/FreeBSD.x64.Debug/corerun ~/coreclr-demo/runtime +janhenke@freebsd-frankfurt:~/git/coreclr % cp artifacts/Product/FreeBSD.x64.Debug/libcoreclr*.so ~/coreclr-demo/runtime ``` Build the Framework Native Components @@ -97,7 +97,7 @@ Build the Framework Native Components ```sh janhenke@freebsd-frankfurt:~/git/corefx$ ./build-native.sh -janhenke@freebsd-frankfurt:~/git/corefx$ cp bin/FreeBSD.x64.Debug/Native/*.so ~/coreclr-demo/runtime +janhenke@freebsd-frankfurt:~/git/corefx$ cp artifacts/FreeBSD.x64.Debug/Native/*.so ~/coreclr-demo/runtime ``` Build the Framework Managed Components @@ -251,7 +251,7 @@ This can be done after a clean build, without any other dependencies. From the coreclr project directory: ```sh -janhenke@freebsd-frankfurt:~/coreclr % ./src/pal/tests/palsuite/runpaltests.sh ~/coreclr/bin/obj/FreeBSD.x64.Debug ~/coreclr/bin/paltestout +janhenke@freebsd-frankfurt:~/coreclr % ./src/pal/tests/palsuite/runpaltests.sh ~/coreclr/artifacts/obj/FreeBSD.x64.Debug ~/coreclr/artifacts/paltestout ``` This should run all the tests associated with the PAL. diff --git a/docs/coreclr/building/linux-instructions.md b/docs/coreclr/building/linux-instructions.md index 9ec3cf27d9dfac..72e663cacb7bc9 100644 --- a/docs/coreclr/building/linux-instructions.md +++ b/docs/coreclr/building/linux-instructions.md @@ -134,7 +134,7 @@ To build the runtime on Linux, run build.sh from the root of the coreclr reposit ./build.sh ``` -After the build is completed, there should some files placed in `bin/Product/Linux.x64.Debug`. The ones we are interested in are: +After the build is completed, there should some files placed in `artifacts/Product/Linux.x64.Debug`. The ones we are interested in are: * `corerun`: The command line host. This program loads and starts the CoreCLR runtime and passes the managed program you want to run to it. * `libcoreclr.so`: The CoreCLR runtime itself. @@ -149,7 +149,7 @@ The Core_Root folder will have the built binaries, from `build.sh` and it will a ./build-test.sh generatelayoutonly ``` -After the build is complete you will be able to find the output in the `bin/tests/Linux.x64.Debug/Tests/Core_Root` folder. +After the build is complete you will be able to find the output in the `artifacts/tests/Linux.x64.Debug/Tests/Core_Root` folder. Running a single test =================== @@ -157,6 +157,6 @@ Running a single test After `build-test.sh` is run, corerun from the Core_Root folder is ready to be run. This can be done by using the full absolute path to corerun, or by setting an environment variable to the Core_Root folder. ```sh -export CORE_ROOT=/home/dotnet-bot/coreclr/bin/tests/Linux.x64.Debug/Tests/Core_Root +export CORE_ROOT=/home/dotnet-bot/coreclr/artifacts/tests/Linux.x64.Debug/Tests/Core_Root $CORE_ROOT/corerun hello_world.dll ``` diff --git a/docs/coreclr/building/netbsd-instructions.md b/docs/coreclr/building/netbsd-instructions.md index 341b64e04b21dd..39a457ab765f47 100644 --- a/docs/coreclr/building/netbsd-instructions.md +++ b/docs/coreclr/building/netbsd-instructions.md @@ -103,13 +103,13 @@ Build CoreFX native x64 Debug and the work (build) dir is in /usr/pkgsrc/wip/cor cd /usr/pkgsrc/wip/corefx-git && make ``` -Build CoreCLR Debug x64 on Linux and copy System.Private.CoreLib.dll from ./bin/Product/Linux.x64.Debug/System.Private.CoreLib.dll to NetBSD machine under /usr/pkg/CoreCLR: +Build CoreCLR Debug x64 on Linux and copy System.Private.CoreLib.dll from ./artifacts/Product/Linux.x64.Debug/System.Private.CoreLib.dll to NetBSD machine under /usr/pkg/CoreCLR: ``` ./build.sh mscorlib Debug ``` -Build CoreFX Debug x64 on Linux and copy bin/ to NetBSD machine under /public/bin: +Build CoreFX Debug x64 on Linux and copy artifacts/ to NetBSD machine under /public/bin: ``` ./build-native.sh -os=NetBSD @@ -124,6 +124,6 @@ $ pwd $ ./run-test.sh \ --coreclr-bins /usr/pkg/CoreCLR/ \ --mscorlib-bins /usr/pkg/CoreCLR/ \ ---corefx-tests /public/bin/tests/NetBSD.AnyCPU.Debug/ \ ---corefx-native-bins ./bin/NetBSD.x64.Debug/Native/ +--corefx-tests /public/artifacts/tests/NetBSD.AnyCPU.Debug/ \ +--corefx-native-bins ./artifacts/NetBSD.x64.Debug/Native/ ``` diff --git a/docs/coreclr/building/osx-instructions.md b/docs/coreclr/building/osx-instructions.md index 867b12f45a6f75..246e507cb4750a 100644 --- a/docs/coreclr/building/osx-instructions.md +++ b/docs/coreclr/building/osx-instructions.md @@ -51,7 +51,7 @@ To Build CoreCLR, run build.sh from the root of the coreclr repo. ./build.sh ``` -After the build has completed, there should some files placed in `bin/Product/OSX.x64.Debug`. The ones we are interested in are: +After the build has completed, there should some files placed in `artifacts/Product/OSX.x64.Debug`. The ones we are interested in are: - `corerun`: The command line host. This program loads and starts the CoreCLR runtime and passes the managed program you want to run to it. - `libcoreclr.dylib`: The CoreCLR runtime itself. @@ -66,7 +66,7 @@ The Core_Root folder will have the built binaries, from `build.sh` and it will a ./build-test.sh generatelayoutonly ``` -After the build is complete you will be able to find the output in the `bin/tests/OSX.x64.Debug/Tests/Core_Root` folder. +After the build is complete you will be able to find the output in the `artifacts/tests/OSX.x64.Debug/Tests/Core_Root` folder. Running a single test =================== @@ -75,6 +75,6 @@ After `build-test.sh` is run, corerun from the Core_Root folder is ready to be r an environment variable to the Core_Root folder. ```sh -export CORE_ROOT=/path/to/coreclr/bin/tests/OSX.x64.Debug/Tests/Core_Root +export CORE_ROOT=/path/to/coreclr/artifacts/tests/OSX.x64.Debug/Tests/Core_Root $CORE_ROOT/corerun hello_world.dll ``` \ No newline at end of file diff --git a/docs/coreclr/building/testing-with-corefx.md b/docs/coreclr/building/testing-with-corefx.md index 86dfc22709d443..e3789e2c4b4794 100644 --- a/docs/coreclr/building/testing-with-corefx.md +++ b/docs/coreclr/building/testing-with-corefx.md @@ -45,7 +45,7 @@ To build CoreFX tests against a current, "live", version of CoreCLR, including w For example: ``` -f:\git\corefx> build.cmd -configuration Release -arch x64 -restore -build -buildtests -test /p:CoreCLROverridePath=f:\git\coreclr\bin\Product\Windows_NT.x64.Checked +f:\git\corefx> build.cmd -configuration Release -arch x64 -restore -build -buildtests -test /p:CoreCLROverridePath=f:\git\coreclr\artifacts\Product\Windows_NT.x64.Checked ``` Note that this will replace the coreclr used in the build, and because `-test` is passed, will also run the tests. @@ -66,7 +66,7 @@ This creates a "testhost" directory with a subdirectory that includes the corecl folder created in step #1. ``` -f:\git\corefx> copy f:\git\coreclr\bin\Product\Windows_NT.x64.Checked\* f:\git\corefx\artifacts\bin\testhost\netcoreapp-Windows_NT-Release-x64\shared\Microsoft.NETCore.App\3.0.0 +f:\git\corefx> copy f:\git\coreclr\artifacts\Product\Windows_NT.x64.Checked\* f:\git\corefx\artifacts\bin\testhost\netcoreapp-Windows_NT-Release-x64\shared\Microsoft.NETCore.App\3.0.0 ``` 3. Optionally, create a script that contains any environment variables you want to set when running each CoreFX test. Disabling TieredCompilation or setting a JIT stress mode is a common case. E.g., diff --git a/docs/coreclr/building/unix-test-instructions.md b/docs/coreclr/building/unix-test-instructions.md index 3af96f81e0a5b2..5f385de66df482 100644 --- a/docs/coreclr/building/unix-test-instructions.md +++ b/docs/coreclr/building/unix-test-instructions.md @@ -76,7 +76,7 @@ Build CoreCLR on the Unix machine. Run tests: -> `~/coreclr$ src/pal/tests/palsuite/runpaltests.sh ~/coreclr/bin/obj/Linux.x64.Debug` +> `~/coreclr$ src/pal/tests/palsuite/runpaltests.sh ~/coreclr/artifacts/obj/Linux.x64.Debug` Test results will go into: diff --git a/docs/coreclr/building/viewing-jit-dumps.md b/docs/coreclr/building/viewing-jit-dumps.md index 88efc62c75d7fa..d254601a94bf04 100644 --- a/docs/coreclr/building/viewing-jit-dumps.md +++ b/docs/coreclr/building/viewing-jit-dumps.md @@ -57,17 +57,17 @@ The first thing to do is setup the .NET Core app we want to dump. Here are the s } ``` -* After you've finished editing the code, run `dotnet restore` and `dotnet publish -c Release`. This should drop all of the binaries needed to run your app in `bin/Release///publish`. +* After you've finished editing the code, run `dotnet restore` and `dotnet publish -c Release`. This should drop all of the binaries needed to run your app in `artifacts/Release///publish`. * Overwrite the CLR dlls with the ones you've built locally. If you're a fan of the command line, here are some shell commands for doing this: ```shell # Windows - robocopy /e \bin\Product\Windows_NT..Release \bin\Release\netcoreapp3.0\\publish > NUL - copy /y \bin\Product\Windows_NT..Debug\clrjit.dll \bin\Release\netcoreapp3.0\\publish > NUL + robocopy /e \artifacts\Product\Windows_NT..Release \artifacts\Release\netcoreapp3.0\\publish > NUL + copy /y \artifacts\Product\Windows_NT..Debug\clrjit.dll \artifacts\Release\netcoreapp3.0\\publish > NUL # Unix - cp -rT /bin/Product/..Release /bin/Release/netcoreapp3.0//publish - cp /bin/Product/..Debug/libclrjit.so /bin/Release/netcoreapp3.0//publish + cp -rT /artifacts/Product/..Release /artifacts/Release/netcoreapp3.0//publish + cp /artifacts/Product/..Debug/libclrjit.so /artifacts/Release/netcoreapp3.0//publish ``` * Set the configuration knobs you need (see below) and run your published app. The info you want should be dumped to stdout. @@ -161,7 +161,7 @@ Below are some of the most useful `COMPlus` variables. Where {method-list} is sp If you followed the tutorial above and ran the sample app, you may be wondering why the disassembly for methods like `Substring` didn't show up in the output. This is because `Substring` lives in mscorlib, which (by default) is compiled ahead-of-time to a native image via [crossgen](../building/crossgen.md). Telling crossgen to dump the info works slightly differently. * First, perform a debug build of the native parts of the repo: `build skipmscorlib skiptests`. - * This should produce the binaries for crossgen in `bin/Product/..Debug`. + * This should produce the binaries for crossgen in `artifacts/Product/..Debug`. * Next, set the appropriate configuration knob for the info you want to dump. Usually, this is just the same as the corresponding JIT knob, except prefixed with `Ngen`; for example, to show the disassembly listing of a particular method you would `set COMPlus_NgenDisasm=Foo`. * Run crossgen on the assembly you want to dump: `crossgen MyLibrary.dll` - * If you want to see the output of crossgen specifically for mscorlib, invoke `build skipnative skiptests` from the repo root. The dumps should be written to a file in `bin/Logs` that you can just view. + * If you want to see the output of crossgen specifically for mscorlib, invoke `build skipnative skiptests` from the repo root. The dumps should be written to a file in `artifacts/Logs` that you can just view. diff --git a/docs/coreclr/building/windows-instructions.md b/docs/coreclr/building/windows-instructions.md index 98254a213e37d8..de8fb8ff065ff3 100644 --- a/docs/coreclr/building/windows-instructions.md +++ b/docs/coreclr/building/windows-instructions.md @@ -84,8 +84,8 @@ the base of the repository. [Lots of build spew] - Product binaries are available at C:\git\coreclr\bin\Product\Windows_NT.x64.debug - Test binaries are available at C:\git\coreclr\bin\tests\Windows_NT.x64.debug + Product binaries are available at C:\git\coreclr\artifacts\Product\Windows_NT.x64.debug + Test binaries are available at C:\git\coreclr\artifacts\tests\Windows_NT.x64.debug ``` As shown above, the product will be placed in diff --git a/docs/coreclr/building/windows-test-instructions.md b/docs/coreclr/building/windows-test-instructions.md index b557cb500daf60..71359d848d5a04 100644 --- a/docs/coreclr/building/windows-test-instructions.md +++ b/docs/coreclr/building/windows-test-instructions.md @@ -49,13 +49,13 @@ For example to run all of the tests using your checked build: \tests\runtest.cmd checked -This will generate a report named as `TestRun__.html` (e.g. `TestRun_Windows_NT__x64__Checked.html`) in the subdirectory `\bin\Logs`. Any tests that failed will be listed in `TestRunResults_Windows_NT__x64__Checked.err`. +This will generate a report named as `TestRun__.html` (e.g. `TestRun_Windows_NT__x64__Checked.html`) in the subdirectory `\artifacts\Logs`. Any tests that failed will be listed in `TestRunResults_Windows_NT__x64__Checked.err`. ### Investigating Test Failures Upon completing a test run, you may find one or more tests have failed. -The output of the Test will be available in Test reports directory, but the default the directory would be something like is `\bin\tests\Windows_NT.x64.Checked\Reports\Exceptions\Finalization`. +The output of the Test will be available in Test reports directory, but the default the directory would be something like is `\artifacts\tests\Windows_NT.x64.Checked\Reports\Exceptions\Finalization`. There are 2 files of interest: @@ -67,15 +67,15 @@ There are 2 files of interest: If you wish to re-run a failed test, please follow the following steps: 1. Set an environment variable, `CORE_ROOT`, pointing to the path to product binaries that was passed to runtest.cmd. -For example using a checked build the location would be: `\bin\tests\Windows_NT.x64.Checked\Tests\Core_Root` +For example using a checked build the location would be: `\artifacts\tests\Windows_NT.x64.Checked\Tests\Core_Root` -1. Next, run the failed test, the command to which is also present in the test report for a failed test. It will be something like `\bin\tests\Windows_NT.x64.Checked\Exceptions\Finalization\Finalizer.cmd`. +1. Next, run the failed test, the command to which is also present in the test report for a failed test. It will be something like `\artifacts\tests\Windows_NT.x64.Checked\Exceptions\Finalization\Finalizer.cmd`. If you wish to run the test under a debugger (e.g. [WinDbg](http://msdn.microsoft.com/en-us/library/windows/hardware/ff551063(v=vs.85).aspx)), append `-debug ` to the test command. For example: - \bin\tests\Windows_NT.x64.Checked\Exceptions\Finalization\Finalizer.cmd -debug + \artifacts\tests\Windows_NT.x64.Checked\Exceptions\Finalization\Finalizer.cmd -debug ### Modifying a test -If test changes are needed, make the change and build the test project. This will binplace the binaries in test binaries folder (e.g. `\bin\tests\Windows_NT.x64.Checked\Exceptions\Finalization`). At this point, follow the steps to re-run a failed test to re-run the modified test. +If test changes are needed, make the change and build the test project. This will binplace the binaries in test binaries folder (e.g. `\artifacts\tests\Windows_NT.x64.Checked\Exceptions\Finalization`). At this point, follow the steps to re-run a failed test to re-run the modified test. diff --git a/docs/coreclr/project-docs/linux-performance-tracing.md b/docs/coreclr/project-docs/linux-performance-tracing.md index e597d41e943d2c..1ad9c0c2f0200c 100644 --- a/docs/coreclr/project-docs/linux-performance-tracing.md +++ b/docs/coreclr/project-docs/linux-performance-tracing.md @@ -190,7 +190,7 @@ Perfcollect can be used to collect data for an application running inside a Dock In order to use the instructions in this document to collect a trace, spawn a new shell inside the container that is privileged. >```bash ->docker exec -it --privileged /bin/bash +>docker exec -it --privileged /artifacts/bash >``` Even though the application hosted in the container isn't privileged, this new shell is, and it will have all the privileges it needs to collect trace data. Now, simply follow the instructions in [Collecting a Trace](#collecting-a-trace) using the privileged shell. diff --git a/docs/coreclr/workflow/UsingCoreRun.md b/docs/coreclr/workflow/UsingCoreRun.md index 75c20c5000f3e3..477b76f24677d3 100644 --- a/docs/coreclr/workflow/UsingCoreRun.md +++ b/docs/coreclr/workflow/UsingCoreRun.md @@ -31,7 +31,7 @@ Consider that you already have a .NET application DLL called HelloWorld.dll and If you execute the following ```bat - set PATH=%PATH%;%CoreCLR%\bin\Product\Windows_NT.x64.Debug + set PATH=%PATH%;%CoreCLR%\artifacts\Product\Windows_NT.x64.Debug set CORE_LIBRARIES=%ProgramFiles%\dotnet\shared\Microsoft.NETCore.App\1.0.0 @@ -73,8 +73,8 @@ variable CORE_ROOT to this directory (running build-test at the repository base) and running 'test\runtest') you can do the following ```bat - set PATH=%PATH%;%CoreCLR%\bin\Product\Windows_NT.x64.Debug - set CORE_ROOT=%CoreCLR%\bin\tests\Windows_NT.x64.Debug\Tests\Core_Root + set PATH=%PATH%;%CoreCLR%\artifacts\Product\Windows_NT.x64.Debug + set CORE_ROOT=%CoreCLR%\artifacts\tests\Windows_NT.x64.Debug\Tests\Core_Root ``` sets you up so that corerun can run any of the test. For example ```bat diff --git a/docs/coreclr/workflow/UsingDotNetCli.md b/docs/coreclr/workflow/UsingDotNetCli.md index e3662a64cb5660..7bfb389583e625 100644 --- a/docs/coreclr/workflow/UsingDotNetCli.md +++ b/docs/coreclr/workflow/UsingDotNetCli.md @@ -44,7 +44,7 @@ Please run `dotnet new nugetconfig` in the app folder and update the created `Nu - + @@ -125,7 +125,7 @@ After you publish you will find all the binaries needed to run your application To run the application simply run the EXE that is in this publish directory (it is the name of the app, or specified in the project file). ``` -.\bin\Debug\netcoreapp3.0\win-x64\publish\HelloWorld.exe +.\artifacts\Debug\netcoreapp3.0\win-x64\publish\HelloWorld.exe ``` Running the app should tell you the version and which user and machine build the assembly as well as the commit hash of the code @@ -133,7 +133,7 @@ at the time of building: ``` Hello World from Core 4.6.26210.0 @BuiltBy: adsitnik-MININT-O513E3V @SrcCode: https://github.com/dotnet/coreclr/tree/3d6da797d1f7dc47d5934189787a4e8006ab3a04 -The location is C:\coreclr\helloWorld\bin\Debug\netcoreapp3.0\win-x64\publish\System.Private.CoreLib.dll +The location is C:\coreclr\helloWorld\artifacts\Debug\netcoreapp3.0\win-x64\publish\System.Private.CoreLib.dll ``` **Congratulations! You have just run your first app against local CoreCLR build!** diff --git a/docs/coreclr/workflow/UsingYourBuild.md b/docs/coreclr/workflow/UsingYourBuild.md index 9f343c44a56a10..d741ea15d48f05 100644 --- a/docs/coreclr/workflow/UsingYourBuild.md +++ b/docs/coreclr/workflow/UsingYourBuild.md @@ -85,7 +85,7 @@ dotnet publish After you publish you will find you all the binaries needed to run your application under `bin\Debug\netcoreapp3.0\win-x64\publish\`. ``` -.\bin\Debug\netcoreapp3.0\win-x64\publish\HelloWorld.exe +.\artifacts\Debug\netcoreapp3.0\win-x64\publish\HelloWorld.exe ``` **But we are not done yet, you need to replace the published runtime files with the files from your local build!** @@ -104,7 +104,7 @@ you wish to update the DLLs. For example typically when you update CoreCLR you e * System.Private.CoreLib.dll - If you modified C# it will end up here. Thus after making a change and building, you can simply copy the updated binary from the `bin\Product\..` -directory to your publication directory (e.g. `helloWorld\bin\Debug\netcoreapp3.0\win-x64\publish`) to quickly +directory to your publication directory (e.g. `helloWorld\artifacts\Debug\netcoreapp3.0\win-x64\publish`) to quickly deploy your new bits. In a lot of cases it is easiest to just copy everything from here to your publication directory. You can build just the .NET Library part of the build by doing (debug, for release add 'release' qualifier) @@ -138,7 +138,7 @@ at the time of building: ``` Hello World from Core 4.6.26210.0 @BuiltBy: adsitnik-MININT-O513E3V @SrcCode: https://github.com/dotnet/coreclr/tree/3d6da797d1f7dc47d5934189787a4e8006ab3a04 -The location is C:\coreclr\helloWorld\bin\Debug\netcoreapp3.0\win-x64\publish\System.Private.CoreLib.dll +The location is C:\coreclr\helloWorld\artifacts\Debug\netcoreapp3.0\win-x64\publish\System.Private.CoreLib.dll ``` ### If it's not using your copied binary @@ -146,7 +146,7 @@ The location is C:\coreclr\helloWorld\bin\Debug\netcoreapp3.0\win-x64\publish\Sy Make sure you are running the exe directly. If you use `dotnet run` it will overwrite your custom binaries before executing the app: ``` -.\bin\Debug\netcoreapp3.0\win-x64\publish\HelloWorld.exe +.\artifacts\Debug\netcoreapp3.0\win-x64\publish\HelloWorld.exe ``` ### If you get a consistency check assertion failure diff --git a/eng/helixcorefxtests.proj b/eng/helixcorefxtests.proj index 75858aeff10603..7b14fb1d0ca70a 100644 --- a/eng/helixcorefxtests.proj +++ b/eng/helixcorefxtests.proj @@ -85,9 +85,8 @@ TODO: ProjectDir, RootBinDir, TestWorkingDir, and TargetsWindows are global properties set in dir.props, remove the property assignment here when we port to arcade. --> $(MSBuildThisFileDirectory)..\ - $(ProjectDir)\src\coreclr\ - $(ProjectDir)bin\ - $(RootBinDir)tests\$(__BuildOS).$(__BuildArch).$(__BuildType)\ + $(ProjectDir)artifacts\bin\coreclr + $(ProjectDir)artifacts\tests\coreclr\$(__BuildOS).$(__BuildArch).$(__BuildType)\ true - $(ProjectDir)tests\CoreFX\CoreFX.issues.rsp + $(ProjectDir)src\coreclr\tests\CoreFX\CoreFX.issues.rsp $(TestWorkingDir)testhost\ $(TestWorkingDir)helix\ @@ -150,7 +149,7 @@ - <_ProjectsToBuild Include="$(ProjectDir)tests\testenvironment.proj"> + <_ProjectsToBuild Include="$(ProjectDir)src\coreclr\tests\testenvironment.proj"> Scenario=$(Scenario);TestEnvFileName=$(TestEnvFilePath);TargetsWindows=$(TargetsWindows) diff --git a/eng/pipelines/coreclr/templates/build-job.yml b/eng/pipelines/coreclr/templates/build-job.yml index f80391da8ed521..1ac2eb09beeb50 100644 --- a/eng/pipelines/coreclr/templates/build-job.yml +++ b/eng/pipelines/coreclr/templates/build-job.yml @@ -149,7 +149,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish Signing Logs inputs: - PathtoPublish: '$(Build.SourcesDirectory)/artifacts/' + PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/' PublishLocation: Container ArtifactName: ${{ format('SignLogs_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} continueOnError: true @@ -207,7 +207,7 @@ jobs: # Publish official build - ${{ if eq(parameters.publishToBlobFeed, 'true') }}: - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: - - script: $(Build.SourcesDirectory)/eng/common/build.sh --ci --restore --publish --configuration $(_BuildConfig) /p:DotNetPublishUsingPipelines=true /p:DotNetPublishToBlobFeed=true /p:DotNetPublishBlobFeedUrl=$(dotnetfeedUrl) /p:DotNetPublishBlobFeedKey=$(dotnetfeedPAT) /p:__BuildType=$(_BuildConfig) /p:__BuildArch=$(archType) /p:__BuildOS=$(osGroup) /p:OSIdentifier=$(osGroup)$(osSubgroup) /bl:"$(Build.SourcesDirectory)/bin/Logs/publish-pkgs.binlog" --projects $(Build.SourcesDirectory)/eng/empty.csproj + - script: $(Build.SourcesDirectory)/eng/common/build.sh --ci --restore --publish --configuration $(_BuildConfig) /p:DotNetPublishUsingPipelines=true /p:DotNetPublishToBlobFeed=true /p:DotNetPublishBlobFeedUrl=$(dotnetfeedUrl) /p:DotNetPublishBlobFeedKey=$(dotnetfeedPAT) /p:__BuildType=$(_BuildConfig) /p:__BuildArch=$(archType) /p:__BuildOS=$(osGroup) /p:OSIdentifier=$(osGroup)$(osSubgroup) /bl:"$(Build.SourcesDirectory)/artifacts/log/publish-pkgs.binlog" --projects $(Build.SourcesDirectory)/eng/empty.csproj displayName: Publish packages to blob feed env: # TODO: remove NUGET_PACKAGES once https://github.com/dotnet/arcade/issues/1578 is fixed @@ -217,7 +217,7 @@ jobs: DotNetCoreSdkDir: /usr/local/dotnet - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: # TODO: pass publish feed url and access token in from the internal pipeline - - powershell: eng\common\build.ps1 -ci -restore -publish -configuration $(_BuildConfig) /p:DotNetPublishUsingPipelines=true /p:DotNetPublishToBlobFeed=true /p:DotNetPublishBlobFeedUrl=$(dotnetfeedUrl) /p:DotNetPublishBlobFeedKey=$(dotnetfeedPAT) /p:__BuildType=$(_BuildConfig) /p:__BuildArch=$(archType) /p:__BuildOS=$(osGroup) /p:OSIdentifier=$(osGroup)$(osSubgroup) /bl:"$(Build.SourcesDirectory)\bin\Logs\publish-pkgs.binlog" -projects $(Build.SourcesDirectory)\eng\empty.csproj + - powershell: eng\common\build.ps1 -ci -restore -publish -configuration $(_BuildConfig) /p:DotNetPublishUsingPipelines=true /p:DotNetPublishToBlobFeed=true /p:DotNetPublishBlobFeedUrl=$(dotnetfeedUrl) /p:DotNetPublishBlobFeedKey=$(dotnetfeedPAT) /p:__BuildType=$(_BuildConfig) /p:__BuildArch=$(archType) /p:__BuildOS=$(osGroup) /p:OSIdentifier=$(osGroup)$(osSubgroup) /bl:"$(Build.SourcesDirectory)\artifacts\log\publish-pkgs.binlog" -projects $(Build.SourcesDirectory)\eng\empty.csproj displayName: Publish packages to blob feed env: # TODO: remove NUGET_PACKAGES once https://github.com/dotnet/arcade/issues/1578 is fixed @@ -227,7 +227,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish Logs inputs: - pathtoPublish: $(coreClrRepoRoot)/bin/Logs + pathtoPublish: $(Build.SourcesDirectory)/artifacts/log artifactName: 'BuildLogs_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)' continueOnError: true condition: always() diff --git a/eng/pipelines/coreclr/templates/build-test-job.yml b/eng/pipelines/coreclr/templates/build-test-job.yml index 851673b48cd347..4c0e90a4b55b6a 100644 --- a/eng/pipelines/coreclr/templates/build-test-job.yml +++ b/eng/pipelines/coreclr/templates/build-test-job.yml @@ -118,7 +118,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish Logs inputs: - pathtoPublish: $(coreClrRepoRoot)/bin/Logs + pathtoPublish: $(Build.SourcesDirectory)/artifacts/log artifactName: 'TestBuildLogs_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_${{ parameters.testGroup }}' continueOnError: true condition: always() diff --git a/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml b/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml index a44820f01828e9..1faa94d9a7043c 100644 --- a/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml +++ b/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml @@ -39,15 +39,19 @@ jobs: - name: crossFlavor value: $(osGroup).$(hostArchType)_$(archType).$(buildConfigUpper) - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: + - name: artifactsDirectory + value: $(Build.SourcesDirectory)/artifacts - name: binDirectory - value: $(coreClrRepoRoot)/bin + value: $(artifactsDirectory)/bin - name: productDirectory - value: $(binDirectory)/Product + value: $(binDirectory)/coreclr - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - name: artifactsDirectory + value: $(Build.SourcesDirectory)\artifacts - name: binDirectory - value: $(coreClrRepoRoot)\bin + value: $(artifactsDirectory)\bin - name: productDirectory - value: $(binDirectory\Product + value: $(binDirectory)\coreclr # Test job depends on the corresponding build job dependsOn: ${{ format('build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} @@ -74,11 +78,11 @@ jobs: - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: - script: | chmod +x $(productDirectory)/$(targetFlavor)/$(hostArchType)/crossgen - mkdir -p $(binDirectory)/Logs/$(crossFlavor) + mkdir -p $(artifactsDirectory)/log/$(crossFlavor) displayName: Create directories and ensure crossgen is executable - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: - script: | - mkdir $(binDirectory)\Logs\$(crossFlavor) + mkdir $(artifactsDirectory)\log\$(crossFlavor) displayName: Create directories @@ -98,15 +102,15 @@ jobs: crossgen_framework --crossgen $(productDirectory)/$(targetFlavor)/$(hostArchType)/crossgen --il_corelib $(productDirectory)/$(targetFlavor)/IL/System.Private.CoreLib.dll - --core_root $(binDirectory)/tests/$(targetFlavor)/Tests/Core_Root - --result_dir $(binDirectory)/Logs/$(crossFlavor) + --core_root $(artifactsDirectory)/tests/coreclr/$(targetFlavor)/Tests/Core_Root + --result_dir $(artifactsDirectory)/log/$(crossFlavor) ${{ if eq(parameters.osGroup, 'Windows_NT') }}: arguments: crossgen_framework --crossgen $(productDirectory)\$(targetFlavor)\$(hostArchType)\crossgen --il_corelib $(productDirectory)\$(targetFlavor)\IL\System.Private.CoreLib.dll - --core_root $(binDirectory)\tests\$(targetFlavor)\Tests\Core_Root - --result_dir $(binDirectory)\Logs\$(crossFlavor) + --core_root $(artifactsDirectory)\tests\coreclr\$(targetFlavor)\Tests\Core_Root + --result_dir $(artifactsDirectory)\log\$(crossFlavor) # Send payload to Helix where the native output is generated and compared to the baseline @@ -125,33 +129,33 @@ jobs: CorrelationPayloadDirectory: '$(coreClrRepoRoot)/tests/scripts' ${{ if ne(parameters.osName, 'Windows_NT') }}: WorkItemCommand: - chmod +x $HELIX_WORKITEM_PAYLOAD/Product/$(targetFlavor)/crossgen; - mkdir -p $HELIX_WORKITEM_PAYLOAD/Logs/$(targetFlavor); + chmod +x $HELIX_WORKITEM_PAYLOAD/coreclr/$(targetFlavor)/crossgen; + mkdir -p $HELIX_WORKITEM_PAYLOAD/log/$(targetFlavor); python -u $HELIX_CORRELATION_PAYLOAD/crossgen_comparison.py crossgen_framework - --crossgen $HELIX_WORKITEM_PAYLOAD/Product/$(targetFlavor)/crossgen - --il_corelib $HELIX_WORKITEM_PAYLOAD/Product/$(targetFlavor)/IL/System.Private.CoreLib.dll + --crossgen $HELIX_WORKITEM_PAYLOAD/coreclr/$(targetFlavor)/crossgen + --il_corelib $HELIX_WORKITEM_PAYLOAD/coreclr/$(targetFlavor)/IL/System.Private.CoreLib.dll --core_root $HELIX_WORKITEM_PAYLOAD/tests/$(targetFlavor)/Tests/Core_Root - --result_dir $HELIX_WORKITEM_PAYLOAD/Logs/$(targetFlavor); + --result_dir $HELIX_WORKITEM_PAYLOAD/log/$(targetFlavor); python -u $HELIX_CORRELATION_PAYLOAD/crossgen_comparison.py compare - --base_dir $HELIX_WORKITEM_PAYLOAD/Logs/$(crossFlavor) - --diff_dir $HELIX_WORKITEM_PAYLOAD/Logs/$(targetFlavor) + --base_dir $HELIX_WORKITEM_PAYLOAD/log/$(crossFlavor) + --diff_dir $HELIX_WORKITEM_PAYLOAD/log/$(targetFlavor) ${{ if eq(parameters.osName, 'Windows_NT') }}: WorkItemCommand: - mkdir %HELIX_WORKITEM_PAYLOAD%\Logs\$(targetFlavor); + mkdir %HELIX_WORKITEM_PAYLOAD%\log\$(targetFlavor); python -u %HELIX_CORRELATION_PAYLOAD%\crossgen_comparison.py crossgen_framework --crossgen %HELIX_WORKITEM_PAYLOAD%\Product\$(targetFlavor)\crossgen --il_corelib %HELIX_WORKITEM_PAYLOAD%\Product\$(targetFlavor)\IL\System.Private.CoreLib.dll --core_root %HELIX_WORKITEM_PAYLOAD%\tests\$(targetFlavor)\Tests\Core_Root - --result_dir %HELIX_WORKITEM_PAYLOAD%\Logs\$(targetFlavor); + --result_dir %HELIX_WORKITEM_PAYLOAD%\log\$(targetFlavor); python -u %HELIX_CORRELATION_PAYLOAD%\crossgen_comparison.py compare - --base_dir %HELIX_WORKITEM_PAYLOAD%\Logs\$(crossFlavor) - --diff_dir %HELIX_WORKITEM_PAYLOAD%\Logs\$(targetFlavor) + --base_dir %HELIX_WORKITEM_PAYLOAD%\log\$(crossFlavor) + --diff_dir %HELIX_WORKITEM_PAYLOAD%\log\$(targetFlavor) - # Publish Logs + # Publish log - task: PublishBuildArtifacts@1 - displayName: Publish Logs + displayName: Publish log inputs: - pathtoPublish: $(binDirectory)/Logs - artifactName: ${{ format('TestLogs_crossgen_comparison_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} + pathtoPublish: $(artifactsDirectory)/log + artifactName: ${{ format('Testlog_crossgen_comparison_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} continueOnError: true condition: always() diff --git a/eng/pipelines/coreclr/templates/perf-job.yml b/eng/pipelines/coreclr/templates/perf-job.yml index a6b09981057786..b63355ae6195bd 100644 --- a/eng/pipelines/coreclr/templates/perf-job.yml +++ b/eng/pipelines/coreclr/templates/perf-job.yml @@ -34,9 +34,9 @@ jobs: dependsOn: ${{ format('build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }} ${{ if eq(parameters.osGroup, 'Windows_NT') }}: - extraSetupParameters: -CoreRootDirectory $(Build.SourcesDirectory)\bin\tests\${{ parameters.osGroup }}.${{ parameters.archType }}.Release\Tests\Core_Root -Architecture ${{ parameters.archType }} + extraSetupParameters: -CoreRootDirectory $(Build.SourcesDirectory)\artifacts\tests\coreclr\${{ parameters.osGroup }}.${{ parameters.archType }}.Release\Tests\Core_Root -Architecture ${{ parameters.archType }} ${{ if ne(parameters.osGroup, 'Windows_NT') }}: - extraSetupParameters: --corerootdirectory $(Build.SourcesDirectory)/bin/tests/${{ parameters.osGroup }}.${{ parameters.archType }}.Release/Tests/Core_Root --architecture ${{ parameters.archType }} + extraSetupParameters: --corerootdirectory $(Build.SourcesDirectory)/artifacts/tests/coreclr/${{ parameters.osGroup }}.${{ parameters.archType }}.Release/Tests/Core_Root --architecture ${{ parameters.archType }} frameworks: - ${{ parameters.framework }} diff --git a/eng/pipelines/coreclr/templates/run-test-job.yml b/eng/pipelines/coreclr/templates/run-test-job.yml index 8c7ef5c84491bb..9c68e33f18f7b6 100644 --- a/eng/pipelines/coreclr/templates/run-test-job.yml +++ b/eng/pipelines/coreclr/templates/run-test-job.yml @@ -380,7 +380,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish Logs inputs: - pathtoPublish: $(coreClrRepoRoot)/bin/Logs + pathtoPublish: $(Build.SourcesDirectory)/artifacts/log artifactName: '$(LogNamePrefix)_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_${{ parameters.testGroup }}' continueOnError: true condition: always() \ No newline at end of file diff --git a/eng/pipelines/coreclr/templates/send-to-helix-step.yml b/eng/pipelines/coreclr/templates/send-to-helix-step.yml index 8e57a4f7b5d181..cd6a354fcabe21 100644 --- a/eng/pipelines/coreclr/templates/send-to-helix-step.yml +++ b/eng/pipelines/coreclr/templates/send-to-helix-step.yml @@ -30,7 +30,7 @@ steps: ${{ if ne(parameters.condition, '') }}: condition: ${{ parameters.condition }} - - powershell: eng\common\msbuild.ps1 -ci ${{ parameters.helixProjectArguments }} /maxcpucount /bl:${{ parameters.coreClrRepoRoot }}/bin/Logs/SendToHelix.binlog + - powershell: eng\common\msbuild.ps1 -ci ${{ parameters.helixProjectArguments }} /maxcpucount /bl:$(Build.SourcesDirectory)/artifacts/log/SendToHelix.binlog displayName: ${{ parameters.displayName }} ${{ if ne(parameters.condition, '') }}: condition: ${{ parameters.condition }} @@ -69,7 +69,7 @@ steps: # Arcade uses this SDK instead of trying to restore one. DotNetCoreSdkDir: /usr/local/dotnet - - script: $(Build.SourcesDirectory)/eng/common/msbuild.sh --ci ${{ parameters.helixProjectArguments }} /maxcpucount /bl:${{ parameters.coreClrRepoRoot }}/bin/Logs/SendToHelix.binlog + - script: $(Build.SourcesDirectory)/eng/common/msbuild.sh --ci ${{ parameters.helixProjectArguments }} /maxcpucount /bl:$(Build.SourcesDirectory)/artifacts/log/SendToHelix.binlog displayName: ${{ parameters.displayName }} ${{ if ne(parameters.condition, '') }}: condition: ${{ parameters.condition }} diff --git a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml index add24db9da37c0..7c2f4e3efa9fab 100644 --- a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml +++ b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml @@ -88,7 +88,7 @@ jobs: value: '$(coreClrRepoRoot)$(dir)' - name: binTestsPath - value: '$(coreClrRepoRoot)/bin/tests' + value: '$(Build.SourcesDirectory)/artifacts/tests/coreclr' - name: testRootFolderPath value: '$(binTestsPath)/$(osGroup).$(archType).$(buildConfigUpper)' @@ -100,7 +100,7 @@ jobs: value: 'BinDir_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)' - name: buildProductRootFolderPath - value: '$(coreClrRepoRoot)/bin/Product/$(osGroup).$(archType).$(buildConfigUpper)' + value: '$(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).$(archType).$(buildConfigUpper)' - name: testArtifactName value: Tests_${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }}_$(archType)_$(buildConfig) diff --git a/src/coreclr/CMakeLists.txt b/src/coreclr/CMakeLists.txt index 50fec2a4640448..226f0af522b28a 100644 --- a/src/coreclr/CMakeLists.txt +++ b/src/coreclr/CMakeLists.txt @@ -171,7 +171,7 @@ include(clrdefinitions.cmake) #------------------------------------- # Include the basic prebuilt headers - required for getting fileversion resource details. include_directories("src/pal/prebuilt/inc") -include_directories("bin/obj") +include_directories("../../artifacts/obj/coreclr") if(FEATURE_STANDALONE_GC) add_definitions(-DFEATURE_STANDALONE_GC) diff --git a/src/coreclr/_build-commons.sh b/src/coreclr/_build-commons.sh index 28f02ce1d9da88..43a52e56ef9ece 100755 --- a/src/coreclr/_build-commons.sh +++ b/src/coreclr/_build-commons.sh @@ -42,7 +42,7 @@ usage() echo "" echo "BuildArch can be: -x64, -x86, -arm, -armel, -arm64" echo "BuildType can be: -debug, -checked, -release" - echo "-bindir - output directory (defaults to $__ProjectRoot/bin)" + echo "-bindir - output directory (defaults to $__ProjectRoot/artifacts)" echo "-clang - optional argument to build using clang in PATH (default)." echo "-clangx.y - optional argument to build using clang version x.y." echo "-cmakeargs - user-settable additional arguments passed to CMake." diff --git a/src/coreclr/build-packages.cmd b/src/coreclr/build-packages.cmd index 444ce047da8bd7..b13ce5b0f831f1 100644 --- a/src/coreclr/build-packages.cmd +++ b/src/coreclr/build-packages.cmd @@ -34,7 +34,7 @@ if [!processedArgs!]==[] ( :ArgsDone -set logFile=%__RepoRootDir%bin\Logs\build-packages.binlog +set logFile=%__RepoRootDir%artifacts\log\build-packages.binlog powershell -NoProfile -ExecutionPolicy ByPass -NoLogo -File "%__RepoRootDir%eng\common\build.ps1"^ -r -b -projects %__ProjectDir%src\.nuget\packages.builds^ -verbosity minimal /bl:%logFile% /nodeReuse:false^ diff --git a/src/coreclr/build-packages.sh b/src/coreclr/build-packages.sh index 2721bb78c3097f..6a7993487e4511 100755 --- a/src/coreclr/build-packages.sh +++ b/src/coreclr/build-packages.sh @@ -127,7 +127,7 @@ if [ "${__DistroRid}" = "linux-musl-arm64" ]; then export OutputRID=${__DistroRid} fi -logFile=$__ProjectRoot/bin/Logs/build-packages.binlog +logFile=$__ProjectRoot/artifacts/log/build-packages.binlog $__RepoRootDir/eng/common/build.sh -r -b -projects $__ProjectRoot/src/.nuget/packages.builds \ -verbosity minimal -bl:$logFile \ /p:__BuildOS=$__BuildOS \ diff --git a/src/coreclr/build-test.cmd b/src/coreclr/build-test.cmd index 1af38251d7d968..f126181d88b681 100644 --- a/src/coreclr/build-test.cmd +++ b/src/coreclr/build-test.cmd @@ -36,8 +36,8 @@ set "__RepoRootDir=%__ProjectDir%\..\.." set "__TestDir=%__ProjectDir%\tests" set "__ProjectFilesDir=%__TestDir%" set "__SourceDir=%__ProjectDir%\src" -set "__RootBinDir=%__ProjectDir%\bin" -set "__LogsDir=%__RootBinDir%\Logs" +set "__RootBinDir=%__RepoRootDir%\artifacts" +set "__LogsDir=%__RootBinDir%\log" set "__MsbuildDebugLogsDir=%__LogsDir%\MsbuildDebugLogs" :: Default __Exclude to issues.targets @@ -142,8 +142,8 @@ set __msbuildArgs=/p:__BuildOS=%__BuildOS% /p:__BuildType=%__BuildType% /p:__Bui echo %__MsgPrefix%Commencing CoreCLR test build -set "__BinDir=%__RootBinDir%\Product\%__BuildOS%.%__BuildArch%.%__BuildType%" -set "__TestRootDir=%__RootBinDir%\tests" +set "__BinDir=%__RootBinDir%\bin\coreclr\%__BuildOS%.%__BuildArch%.%__BuildType%" +set "__TestRootDir=%__RootBinDir%\tests\coreclr" set "__TestBinDir=%__TestRootDir%\%__BuildOS%.%__BuildArch%.%__BuildType%" REM We have different managed and native intermediate dirs because the managed bits will include @@ -151,7 +151,7 @@ REM the configuration information deeper in the intermediates path. REM These variables are used by the msbuild project files. if not defined __TestIntermediateDir ( - set "__TestIntermediateDir=tests\obj\%__BuildOS%.%__BuildArch%.%__BuildType%" + set "__TestIntermediateDir=tests\coreclr\obj\%__BuildOS%.%__BuildArch%.%__BuildType%" ) set "__NativeTestIntermediatesDir=%__RootBinDir%\%__TestIntermediateDir%\Native" set "__ManagedTestIntermediatesDir=%__RootBinDir%\%__TestIntermediateDir%\Managed" diff --git a/src/coreclr/build-test.sh b/src/coreclr/build-test.sh index 05722105d57227..3f0fc0634b5150 100755 --- a/src/coreclr/build-test.sh +++ b/src/coreclr/build-test.sh @@ -675,7 +675,7 @@ __MSBCleanBuildArgs= __NativeTestIntermediatesDir= __PortableBuild=1 __RebuildTests=0 -__RootBinDir="$__ProjectDir/bin" +__RootBinDir="$__RepoRootDir/artifacts" __RunTests=0 __SkipConfigure=0 __SkipGenerateLayout=0 @@ -696,16 +696,16 @@ CORE_ROOT= source "$__ProjectRoot"/_build-commons.sh # Set dependent variables -__LogsDir="$__RootBinDir/Logs" +__LogsDir="$__RootBinDir/log" __MsbuildDebugLogsDir="$__LogsDir/MsbuildDebugLogs" # Set the remaining variables based upon the determined build configuration -__BinDir="$__RootBinDir/Product/$__BuildOS.$__BuildArch.$__BuildType" +__BinDir="$__RootBinDir/bin/coreclr/$__BuildOS.$__BuildArch.$__BuildType" __PackagesBinDir="$__BinDir/.nuget" __TestDir="$__ProjectDir/tests" -__TestWorkingDir="$__RootBinDir/tests/$__BuildOS.$__BuildArch.$__BuildType" -__IntermediatesDir="$__RootBinDir/obj/$__BuildOS.$__BuildArch.$__BuildType" -__TestIntermediatesDir="$__RootBinDir/tests/obj/$__BuildOS.$__BuildArch.$__BuildType" +__TestWorkingDir="$__RootBinDir/tests/coreclr/$__BuildOS.$__BuildArch.$__BuildType" +__IntermediatesDir="$__RootBinDir/obj/coreclr/$__BuildOS.$__BuildArch.$__BuildType" +__TestIntermediatesDir="$__RootBinDir/tests/coreclr/obj/$__BuildOS.$__BuildArch.$__BuildType" __isMSBuildOnNETCoreSupported=0 __CrossComponentBinDir="$__BinDir" __CrossCompIntermediatesDir="$__IntermediatesDir/crossgen" diff --git a/src/coreclr/build.cmd b/src/coreclr/build.cmd index e30deaf1faf8a8..4bfd8c0bb4d525 100644 --- a/src/coreclr/build.cmd +++ b/src/coreclr/build.cmd @@ -55,8 +55,8 @@ set "__RepoRootDir=%__ProjectDir%\..\.." set "__ProjectFilesDir=%__ProjectDir%" set "__SourceDir=%__ProjectDir%\src" -set "__RootBinDir=%__ProjectDir%\bin" -set "__LogsDir=%__RootBinDir%\Logs" +set "__RootBinDir=%__RepoRootDir%\artifacts" +set "__LogsDir=%__RootBinDir%\log" set "__MsbuildDebugLogsDir=%__LogsDir%\MsbuildDebugLogs" set __BuildAll= @@ -303,9 +303,9 @@ if %__PgoOptimize%==0 ( ) ) -set "__BinDir=%__RootBinDir%\Product\%__BuildOS%.%__BuildArch%.%__BuildType%" -set "__IntermediatesDir=%__RootBinDir%\obj\%__BuildOS%.%__BuildArch%.%__BuildType%" -set "__ArtifactsIntermediatesDir=%__RepoRootDir%\artifacts\obj\" +set "__BinDir=%__RootBinDir%\bin\coreclr\%__BuildOS%.%__BuildArch%.%__BuildType%" +set "__IntermediatesDir=%__RootBinDir%\obj\coreclr\%__BuildOS%.%__BuildArch%.%__BuildType%" +set "__ArtifactsIntermediatesDir=%__RepoRootDir%\artifacts\obj\coreclr\" if "%__NMakeMakefiles%"=="1" (set "__IntermediatesDir=%__RootBinDir%\nmakeobj\%__BuildOS%.%__BuildArch%.%__BuildType%") set "__PackagesBinDir=%__BinDir%\.nuget" set "__CrossComponentBinDir=%__BinDir%" @@ -371,7 +371,7 @@ REM ============================================================================ @if defined _echo @echo on powershell -NoProfile -ExecutionPolicy ByPass -NoLogo -File "%__RepoRootDir%\eng\common\msbuild.ps1" %__ArcadeScriptArgs%^ - %__RepoRootDir%\eng\empty.csproj /p:NativeVersionFile="%__RootBinDir%\obj\_version.h"^ + %__RepoRootDir%\eng\empty.csproj /p:NativeVersionFile="%__RootBinDir%\obj\coreclr\_version.h"^ /t:GenerateNativeVersionFile /restore^ %__CommonMSBuildArgs% %__UnprocessedBuildArgs% if not !errorlevel! == 0 ( diff --git a/src/coreclr/build.sh b/src/coreclr/build.sh index 5e7cbc5add6e65..c9a34ca1f8a128 100755 --- a/src/coreclr/build.sh +++ b/src/coreclr/build.sh @@ -608,7 +608,7 @@ __PgoOptDataPath="" __PgoOptimize=1 __PortableBuild=1 __ProjectDir="$__ProjectRoot" -__RootBinDir="$__ProjectDir/bin" +__RootBinDir="$__RepoRootDir/artifacts" __SignTypeArg="" __SkipConfigure=0 __SkipCoreCLR=0 @@ -637,14 +637,14 @@ if [ "${__BuildArch}" != "${__HostArch}" ]; then fi # Set dependent variables -__LogsDir="$__RootBinDir/Logs" +__LogsDir="$__RootBinDir/log" __MsbuildDebugLogsDir="$__LogsDir/MsbuildDebugLogs" # Set the remaining variables based upon the determined build configuration -__BinDir="$__RootBinDir/Product/$__BuildOS.$__BuildArch.$__BuildType" +__BinDir="$__RootBinDir/bin/coreclr/$__BuildOS.$__BuildArch.$__BuildType" __PackagesBinDir="$__BinDir/.nuget" -export __IntermediatesDir="$__RootBinDir/obj/$__BuildOS.$__BuildArch.$__BuildType" -export __ArtifactsIntermediatesDir="$__RepoRootDir/artifacts/obj" +export __IntermediatesDir="$__RootBinDir/obj/coreclr/$__BuildOS.$__BuildArch.$__BuildType" +export __ArtifactsIntermediatesDir="$__RepoRootDir/artifacts/obj/coreclr" __isMSBuildOnNETCoreSupported=0 __CrossComponentBinDir="$__BinDir" diff --git a/src/coreclr/dir.common.props b/src/coreclr/dir.common.props index a071e1055a8365..0eb2d7277fd53a 100644 --- a/src/coreclr/dir.common.props +++ b/src/coreclr/dir.common.props @@ -38,17 +38,21 @@ + <__ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory) $(__ProjectDir)\ + $(ProjectDir)\..\..\ $(MSBuildThisFileDirectory) + $(RootRepoDir)artifacts\obj\coreclr\$(MSBuildProjectName)\ + $(__SourceDir)\ $(ProjectDir)src\ $(__RootBinDir)\ - $(ProjectDir)bin\ + $(RootRepoDir)artifacts\ $(__BinDir)\ - $(RootBinDir)Product\$(PlatformConfigPathPart)\ + $(RootBinDir)bin\coreclr\$(PlatformConfigPathPart)\ false diff --git a/src/coreclr/src/tools/crossgen2/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj b/src/coreclr/src/tools/crossgen2/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj index 49afbe7fb49341..d4aba1f5da3375 100644 --- a/src/coreclr/src/tools/crossgen2/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj +++ b/src/coreclr/src/tools/crossgen2/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj @@ -11,7 +11,7 @@ false false diff --git a/src/coreclr/src/tools/crossgen2/ILCompiler.TypeSystem.ReadyToRun/ILCompiler.TypeSystem.ReadyToRun.csproj b/src/coreclr/src/tools/crossgen2/ILCompiler.TypeSystem.ReadyToRun/ILCompiler.TypeSystem.ReadyToRun.csproj index df1d68c0de758b..205e9814967acb 100644 --- a/src/coreclr/src/tools/crossgen2/ILCompiler.TypeSystem.ReadyToRun/ILCompiler.TypeSystem.ReadyToRun.csproj +++ b/src/coreclr/src/tools/crossgen2/ILCompiler.TypeSystem.ReadyToRun/ILCompiler.TypeSystem.ReadyToRun.csproj @@ -11,7 +11,7 @@ false false diff --git a/src/coreclr/src/tools/crossgen2/crossgen2/crossgen2.csproj b/src/coreclr/src/tools/crossgen2/crossgen2/crossgen2.csproj index a8be30a7073083..c8a30202d75a22 100644 --- a/src/coreclr/src/tools/crossgen2/crossgen2/crossgen2.csproj +++ b/src/coreclr/src/tools/crossgen2/crossgen2/crossgen2.csproj @@ -10,7 +10,7 @@ false $(BinDir)/crossgen2 false diff --git a/src/coreclr/src/vm/.vscode/c_cpp_properties.json b/src/coreclr/src/vm/.vscode/c_cpp_properties.json index 2dc2f5cbe4f606..7656f32adac2bc 100644 --- a/src/coreclr/src/vm/.vscode/c_cpp_properties.json +++ b/src/coreclr/src/vm/.vscode/c_cpp_properties.json @@ -3,11 +3,11 @@ { "name": "Win32-Debug", "includePath": [ - "../../bin/obj/Windows_NT.x64.Debug/src/vm/dac", + "../../../../artifacts/obj/coreclr/Windows_NT.x64.Debug/src/vm/dac", "../../src/vm/dac", "../../src/vm", "../../src/pal/prebuilt/inc", - "../../bin/obj", + "../../../../artifacts/obj", "../../src/inc", "../../src/strongname/inc", "../../src/inc/winrt", @@ -17,8 +17,8 @@ "../../src/md/inc", "../../src/classlibnative/bcltype", "../../src/classlibnative/inc", - "../../bin/obj/Windows_NT.x64.Debug/src/inc", - "../../bin/obj/Windows_NT.x64.Debug/src/inc/etw", + "../../../../artifacts/obj/coreclr/Windows_NT.x64.Debug/src/inc", + "../../../../artifacts/obj/coreclr/Windows_NT.x64.Debug/src/inc/etw", "../../src/vm/amd64" ], "defines": [ diff --git a/src/coreclr/tests/Directory.Build.props b/src/coreclr/tests/Directory.Build.props index 9942545cba2e2e..aaa612c0fae31a 100644 --- a/src/coreclr/tests/Directory.Build.props +++ b/src/coreclr/tests/Directory.Build.props @@ -21,12 +21,12 @@ $(__RootBinDir)\ - $(ProjectDir)..\bin\ + $(ProjectDir)..\..\..\artifacts\ $(__BinDir)\ - $(RootBinDir)Product\$(BuildOS).$(BuildArch).$(BuildType)\ + $(RootBinDir)bin\coreclr\$(BuildOS).$(BuildArch).$(BuildType)\ - $(RootBinDir)tests\$(BuildOS).$(BuildArch).$(BuildType)\ + $(RootBinDir)tests\coreclr\$(BuildOS).$(BuildArch).$(BuildType)\ $(__AltJitArch) @@ -37,7 +37,7 @@ that BuildVersionFile gets the correct value. --> $(RootBinDir)obj\ $(BaseIntermediateOutputPath)\$(BuildOS).$(BuildArch).$(BuildType) - $(BaseIntermediateOutputPath)\$(BuildOS).$(BuildArch).$(BuildType) + $(BaseIntermediateOutputPath)\coreclr\$(BuildOS).$(BuildArch).$(BuildType) @@ -54,7 +54,7 @@ $(BaseIntermediateOutputPath)BuildVersion-$(OfficialBuildId).props - + diff --git a/src/coreclr/tests/bringup_runtest.sh b/src/coreclr/tests/bringup_runtest.sh index 01af81657e490b..efc4cc058e2011 100755 --- a/src/coreclr/tests/bringup_runtest.sh +++ b/src/coreclr/tests/bringup_runtest.sh @@ -8,24 +8,24 @@ function print_usage { echo '' echo 'coreclr/tests/runtest.sh' echo ' --testRootDir="temp/Windows_NT.x64.Debug"' - echo ' --testNativeBinDir="coreclr/bin/obj/Linux.x64.Debug/tests"' - echo ' --coreOverlayDir="coreclr/bin/tests/Linux.x64.Debug/Tests/Core_Root"' + echo ' --testNativeBinDir="runtime/artifacts/obj/Linux.x64.Debug/tests"' + echo ' --coreOverlayDir="runtime/artifacts/tests/Linux.x64.Debug/Tests/Core_Root"' echo ' --copyNativeTestBin' echo '' echo 'Required arguments:' - echo ' --testRootDir= : Root directory of the test build (e.g. coreclr/bin/tests/Windows_NT.x64.Debug).' - echo ' --testNativeBinDir= : Directory of the native CoreCLR test build (e.g. coreclr/bin/obj/Linux.x64.Debug/tests).' + echo ' --testRootDir= : Root directory of the test build (e.g. runtime/artifacts/tests/Windows_NT.x64.Debug).' + echo ' --testNativeBinDir= : Directory of the native CoreCLR test build (e.g. runtime/artifacts/obj/Linux.x64.Debug/tests).' echo ' (Also required: Either --coreOverlayDir, or all of the switches --coreOverlayDir overrides)' echo '' echo 'Optional arguments:' echo ' --coreOverlayDir= : Directory containing core binaries and test dependencies. If not specified, the' echo ' default is testRootDir/Tests/coreoverlay. This switch overrides --coreClrBinDir,' echo ' --mscorlibDir, and --coreFxBinDir.' - echo ' --coreClrBinDir= : Directory of the CoreCLR build (e.g. coreclr/bin/Product/Linux.x64.Debug).' + echo ' --coreClrBinDir= : Directory of the CoreCLR build (e.g. runtime/artifacts/bin/coreclr/Linux.x64.Debug).' echo ' --mscorlibDir= : Directory containing the built mscorlib.dll. If not specified, it is expected to be' echo ' in the directory specified by --coreClrBinDir.' echo ' --coreFxBinDir="" : Directory with CoreFX build outputs' - echo ' (e.g. "corefx/bin/runtime/netcoreapp-Linux-Debug-x64")' + echo ' (e.g. "corefx/artifacts/runtime/netcoreapp-Linux-Debug-x64")' echo ' If files with the same name are present in multiple directories, the first one wins.' echo ' --testDir= : Run tests only in the specified directory. The path is relative to the directory' echo ' specified by --testRootDir. Multiple of this switch may be specified.' @@ -426,7 +426,7 @@ function create_core_overlay { cp -f -v "$coreFxBinDir/"* "$coreOverlayDir/" 2>/dev/null cp -f -p -v "$coreClrBinDir/"* "$coreOverlayDir/" 2>/dev/null if [ -d "$mscorlibDir/bin" ]; then - cp -f -v "$mscorlibDir/bin/"* "$coreOverlayDir/" 2>/dev/null + cp -f -v "$mscorlibDir/artifacts/"* "$coreOverlayDir/" 2>/dev/null fi cp -f -v "$testDependenciesDir/"xunit* "$coreOverlayDir/" 2>/dev/null cp -n -v "$testDependenciesDir/"* "$coreOverlayDir/" 2>/dev/null @@ -453,7 +453,7 @@ function create_testhost if [ -z $coreClrBinDir ]; then local coreClrBinDir=${coreClrSrc}/bin - export __CoreFXTestDir=${coreClrSrc}/bin/tests/CoreFX + export __CoreFXTestDir=${coreClrSrc}/artifacts/tests/CoreFX else export __CoreFXTestDir=${coreClrBinDir}/tests/CoreFX fi @@ -481,7 +481,7 @@ function create_testhost esac local coreFXTestExecutable=xunit.console.netcore.exe - local coreFXLogDir=${coreClrBinDir}/Logs/CoreFX/ + local coreFXLogDir=${coreClrBinDir}/log/CoreFX/ local coreFXTestExecutableArgs="--notrait category=nonnetcoreapptests --notrait category=${coreFXTestExclusionDef} --notrait category=failing --notrait category=IgnoreForCI --notrait category=OuterLoop --notrait Benchmark=true" chmod +x ${dotnetExe} diff --git a/src/coreclr/tests/dir.common.props b/src/coreclr/tests/dir.common.props index 7255e735419d2a..a5495473c6c2ed 100644 --- a/src/coreclr/tests/dir.common.props +++ b/src/coreclr/tests/dir.common.props @@ -3,7 +3,7 @@ - $(CoreclrDir)/bin/tests/obj/$(OSPlatformConfig)/Managed/$(BuildProjectRelativeDir) + $(RootRepoDir)/artifacts/tests/coreclr/obj/$(OSPlatformConfig)/Managed/$(BuildProjectRelativeDir) $(BaseIntermediateOutputPath) - $(CoreclrDir)/bin/tests/$(OSPlatformConfig)/$(BuildProjectRelativeDir) + $(RootRepoDir)/artifacts/tests/coreclr/$(OSPlatformConfig)/$(BuildProjectRelativeDir) $(BaseOutputPath) diff --git a/src/coreclr/tests/override.targets b/src/coreclr/tests/override.targets index a713489fc36ce4..0173750d95b4e3 100644 --- a/src/coreclr/tests/override.targets +++ b/src/coreclr/tests/override.targets @@ -14,7 +14,7 @@ > - + diff --git a/src/coreclr/tests/publishdependency.targets b/src/coreclr/tests/publishdependency.targets index a0e449f5c78d88..b32770001c5206 100644 --- a/src/coreclr/tests/publishdependency.targets +++ b/src/coreclr/tests/publishdependency.targets @@ -36,7 +36,7 @@ - $(ProjectDir)\..\bin\Product\$(BuildOS).$(BuildArch).$(BuildType) + $(RootRepoDir)\artifacts\bin\coreclr\$(BuildOS).$(BuildArch).$(BuildType) $(ProductDestination)\ref diff --git a/src/coreclr/tests/runparallel.sh b/src/coreclr/tests/runparallel.sh index 697d3a00192368..2e1bfdc62df954 100755 --- a/src/coreclr/tests/runparallel.sh +++ b/src/coreclr/tests/runparallel.sh @@ -5,7 +5,7 @@ function print_usage { echo 'CoreCLR parallel test runner script.' echo '' echo 'Required arguments:' - echo ' --testRootDir= : Root directory of the test build (e.g. coreclr/bin/tests/Windows_NT.x64.Debug).' + echo ' --testRootDir= : Root directory of the test build (e.g. coreclr/artifacts/tests/Windows_NT.x64.Debug).' echo ' --coreOverlayDir= : Directory containing core binaries and test dependencies. If not specified, the' echo ' default is testRootDir/Tests/coreoverlay. This switch overrides --coreClrBinDir,' echo ' --mscorlibDir, --coreFxBinDir, and --coreFxNativeBinDir.' diff --git a/src/coreclr/tests/runtest.cmd b/src/coreclr/tests/runtest.cmd index 30713e9ec0a6cc..e080d34d1f4f87 100644 --- a/src/coreclr/tests/runtest.cmd +++ b/src/coreclr/tests/runtest.cmd @@ -16,8 +16,8 @@ set "__ProjectDir=%~dp0" :: remove trailing slash if %__ProjectDir:~-1%==\ set "__ProjectDir=%__ProjectDir:~0,-1%" set "__ProjectFilesDir=%__ProjectDir%" -set "__RootBinDir=%__ProjectDir%\..\bin" -set "__LogsDir=%__RootBinDir%\Logs" +set "__RootBinDir=%__ProjectDir%\..\artifacts" +set "__LogsDir=%__RootBinDir%\log" set "__MsbuildDebugLogsDir=%__LogsDir%\MsbuildDebugLogs" set __ToolsDir=%__ProjectDir%\..\Tools set "DotNetCli=%__ProjectDir%\..\dotnet.cmd" @@ -112,8 +112,8 @@ if defined __TestEnv (if not exist %__TestEnv% echo %__MsgPrefix%Error: Test Env :: Set the remaining variables based upon the determined configuration set __MSBuildBuildArch=%__BuildArch% -set "__BinDir=%__RootBinDir%\Product\%__BuildOS%.%__BuildArch%.%__BuildType%" -set "__TestWorkingDir=%__RootBinDir%\tests\%__BuildOS%.%__BuildArch%.%__BuildType%" +set "__BinDir=%__RootBinDir%\bin\coreclr\%__BuildOS%.%__BuildArch%.%__BuildType%" +set "__TestWorkingDir=%__RootBinDir%\tests\coreclr\%__BuildOS%.%__BuildArch%.%__BuildType%" :: Default global test environment variables :: REVIEW: are these ever expected to be defined on entry to this script? Why? By whom? diff --git a/src/coreclr/tests/runtest.py b/src/coreclr/tests/runtest.py index c40d3a7986db42..78c291a934736a 100755 --- a/src/coreclr/tests/runtest.py +++ b/src/coreclr/tests/runtest.py @@ -29,7 +29,7 @@ # # If you are running tests on a different target than the host that built, the # native tests components must be copied from: -# bin/obj/......../bin/repro + # Now that the repro_location exists under /artifacts/repro # create wrappers which will simply run the test with the correct environment for test in failed_tests: debug_env = DebugEnv(host_os, arch, build_type, env, core_root, coreclr_repo_location, test) diff --git a/src/coreclr/tests/runtest.sh b/src/coreclr/tests/runtest.sh index 0831fefc8dfdf8..e8f61c2d7d76ca 100755 --- a/src/coreclr/tests/runtest.sh +++ b/src/coreclr/tests/runtest.sh @@ -9,10 +9,10 @@ function print_usage { echo 'coreclr/tests/runtest.sh ' echo '' echo 'Optional arguments:' - echo ' --testRootDir= : Root directory of the test build (e.g. coreclr/bin/tests/Windows_NT.x64.Debug).' - echo ' --testNativeBinDir= : Directory of the native CoreCLR test build (e.g. coreclr/bin/obj/Linux.x64.Debug/tests).' + echo ' --testRootDir= : Root directory of the test build (e.g. runtime/artifacts/tests/Windows_NT.x64.Debug).' + echo ' --testNativeBinDir= : Directory of the native CoreCLR test build (e.g. runtime/artifacts/obj/Linux.x64.Debug/tests).' echo ' --coreOverlayDir= : Directory containing core binaries and test dependencies.' - echo ' --coreClrBinDir= : Directory of the CoreCLR build (e.g. coreclr/bin/Product/Linux.x64.Debug).' + echo ' --coreClrBinDir= : Directory of the CoreCLR build (e.g. runtime/artifacts/bin/coreclr/Linux.x64.Debug).' echo ' --build-overlay-only : Build coreoverlay only, and skip running tests.' echo ' --disableEventLogging : Disable the events logged by both VM and Managed Code' echo ' --sequential : Run tests sequentially (default is to run in parallel).' @@ -63,8 +63,8 @@ function create_testhost local coreClrSrcTestDir=$coreClrSrc/tests if [ -z $coreClrBinDir ]; then - local coreClrBinDir=${coreClrSrc}/bin - export __CoreFXTestDir=${coreClrSrc}/bin/tests/CoreFX + local coreClrBinDir=${coreClrSrc}/../../artifacts/bin/coreclr + export __CoreFXTestDir=${coreClrSrc}/../../artifacts/tests/CoreFX else export __CoreFXTestDir=${coreClrBinDir}/tests/CoreFX fi @@ -92,7 +92,7 @@ function create_testhost esac local coreFXTestExecutable=xunit.console.netcore.exe - local coreFXLogDir=${coreClrBinDir}/Logs/CoreFX/ + local coreFXLogDir=${coreClrBinDir}/log/CoreFX/ local coreFXTestExecutableArgs="--notrait category=nonnetcoreapptests --notrait category=${coreFXTestExclusionDef} --notrait category=failing --notrait category=IgnoreForCI --notrait category=OuterLoop --notrait Benchmark=true" chmod +x ${dotnetExe} diff --git a/src/coreclr/tests/scripts/arm32_ci_script.sh b/src/coreclr/tests/scripts/arm32_ci_script.sh index 3ca251f5a57e33..87d3b08043c187 100755 --- a/src/coreclr/tests/scripts/arm32_ci_script.sh +++ b/src/coreclr/tests/scripts/arm32_ci_script.sh @@ -17,7 +17,7 @@ function usage { echo ' --mountPath=/opt/linux-arm-emulator-root' echo ' --buildConfig=Release' echo ' --testRootDir=~/Downloads/Windows_NT.x64.Release' - echo ' --mscorlibDir=~/clr/bin/Product/Linux.armel.Release' + echo ' --mscorlibDir=~/clr/bin/bin/coreclr/Linux.armel.Release' echo ' --coreFxNativeBinDir=~/cfx/bin/Linux.armel.Release' echo ' --coreFxBinDir="~/cfx/bin/Linux.AnyCPU.Release;~/cfx/bin/Unix.AnyCPU.Release;~/cfx/bin/AnyOS.AnyCPU.Release"' echo ' --testDirFile=~/clr/tests/testsRunningInsideARM.txt' @@ -554,7 +554,7 @@ __coreFxNativeBinDirBase= __coreFxBinDirBase= __testDirFileBase= __testNativeBinDirBase="bin/obj/$__buildDirName/tests" -__coreClrBinDirBase="bin/Product/$__buildDirName" +__coreClrBinDirBase="bin/bin/coreclr/$__buildDirName" set -x set -e diff --git a/src/coreclr/tests/scripts/arm32_ci_test.sh b/src/coreclr/tests/scripts/arm32_ci_test.sh index a1966f8337471e..965de587b9dd02 100755 --- a/src/coreclr/tests/scripts/arm32_ci_test.sh +++ b/src/coreclr/tests/scripts/arm32_ci_test.sh @@ -100,15 +100,15 @@ mount -o bind ${CORECLR_DIR} ${__ROOTFS_DIR}${ARM_CHROOT_HOME_DIR} # Test environment emulation using docker and qemu has some problem to use lttng library. # We should remove libcoreclrtraceptprovider.so to avoid test hang. -rm -f -v ${__ROOTFS_DIR}${ARM_CHROOT_HOME_DIR}/bin/Product/${__buildDirName}/libcoreclrtraceptprovider.so +rm -f -v ${__ROOTFS_DIR}${ARM_CHROOT_HOME_DIR}/bin/bin/coreclr/${__buildDirName}/libcoreclrtraceptprovider.so rm -f -v ${__ROOTFS_DIR}${ARM_CHROOT_HOME_DIR}/bin/CoreFxBinDir/libcoreclrtraceptprovider.so chroot ${__ROOTFS_DIR} /bin/bash -x < - $(ProjectDir)..\bin\tests + $(RootRepoDir)\artifacts\tests\coreclr $(__TestRootDir) $(BaseOutputPath)\$(OSPlatformConfig)\ $(BaseOutputPathWithConfig) - $(ProjectDir)..\bin\tests\obj\$(OSPlatformConfig)\Managed\ + $(RootRepoDir)\artifacts\tests\coreclr\obj\$(OSPlatformConfig)\Managed\ $(__ManagedTestIntermediatesDir)\ - <__NativeTestIntermediatesDir Condition="'$(__NativeTestIntermediatesDir)' == ''">$([System.IO.Path]::GetFullPath($(BaseOutputPathWithConfig)..\obj\$(BuildOS).$(Platform).$(Configuration)\Native\)) + <__NativeTestIntermediatesDir Condition="'$(__NativeTestIntermediatesDir)' == ''">$([System.IO.Path]::GetFullPath($(BaseOutputPathWithConfig)..\..\coreclr\obj\$(BuildOS).$(Platform).$(Configuration)\Native\)) $(MSBuildProjectName)\ $([System.String]::Copy('$(MSBuildProjectDirectory)').Replace($(SourceDir),''))\$(MSBuildProjectName) $(BaseIntermediateOutputPath)$(BuildProjectRelativeDir)\ diff --git a/src/coreclr/tests/src/JIT/CheckProjects/CheckProjects.cs b/src/coreclr/tests/src/JIT/CheckProjects/CheckProjects.cs index ec87ed95999284..5e72f865e29d60 100644 --- a/src/coreclr/tests/src/JIT/CheckProjects/CheckProjects.cs +++ b/src/coreclr/tests/src/JIT/CheckProjects/CheckProjects.cs @@ -34,9 +34,9 @@ private static int Main(string[] args) s_tryAndFix = false; // CORE_ROOT should be something like - // c:\repos\coreclr\bin\tests\Windows_NT.x64.Checked\Tests\Core_Root + // c:\repos\coreclr\artifacts\tests\coreclr\Windows_NT.x64.Checked\Tests\Core_Root // or - // D:\j\workspace\x64_release_w---0575cb46\bin\tests\Windows_NT.x64.Release\Tests\Core_Root + // D:\j\workspace\x64_release_w---0575cb46\artifacts\tests\Windows_NT.x64.Release\Tests\Core_Root // We want // c:\repos\coreclr\tests\src\JIT string coreRoot = System.Environment.GetEnvironmentVariable("CORE_ROOT"); diff --git a/src/coreclr/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.cmd b/src/coreclr/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.cmd index e7b89177570603..94a6202c7fb834 100644 --- a/src/coreclr/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.cmd +++ b/src/coreclr/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.cmd @@ -35,13 +35,13 @@ if /I NOT "%CORECLR_ROOT%" == "" goto over @goto done :over -set BENCHMARK_ROOT_DIR=%CORECLR_ROOT%\bin\tests\Windows_NT.%ARCH%.%BUILD%\JIT\Performance\CodeQuality +set BENCHMARK_ROOT_DIR=%CORECLR_ROOT%\artifacts\tests\Windows_NT.%ARCH%.%BUILD%\JIT\Performance\CodeQuality set BENCHMARK_SRC_DIR=%CORECLR_ROOT%\tests\src\JIT\Performance\RunBenchmarks -set BENCHMARK_HOST=CoreRun.exe %CORECLR_ROOT%\bin\tests\Windows_NT.%ARCH%.%BUILD%\JIT\Performance\RunBenchmarks\RunBenchmarks\RunBenchmarks.exe +set BENCHMARK_HOST=CoreRun.exe %CORECLR_ROOT%\artifacts\tests\Windows_NT.%ARCH%.%BUILD%\JIT\Performance\RunBenchmarks\RunBenchmarks\RunBenchmarks.exe set BENCHMARK_RUNNER=-runner CoreRun.exe rem *** used for desktop hosted run -rem set BENCHMARK_HOST=%BENCHMARK_SRC_DIR%\bin\%BUILD%\desktop\RunBenchmarks.exe +rem set BENCHMARK_HOST=%BENCHMARK_SRC_DIR%\artifacts\%BUILD%\desktop\RunBenchmarks.exe rem *** need to copy command files for Bytemark xcopy /y /e /s %CORECLR_ROOT%\tests\src\JIT\Performance\CodeQuality\Bytemark\commands %BENCHMARK_ROOT_DIR%\Bytemark\Bytemark\commands diff --git a/src/coreclr/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.sh b/src/coreclr/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.sh index ee709164c99980..4e54e34a5ff76c 100755 --- a/src/coreclr/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.sh +++ b/src/coreclr/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.sh @@ -34,9 +34,9 @@ if [ -z "$CORECLR_ROOT" ]; then fi # *** Currently we can build test cases only on Windows, so "Windows_NT" is hard-coded in the variables. -BENCHMARK_ROOT_DIR="$CORECLR_ROOT/bin/tests/Windows_NT.$ARCH.$BUILD/JIT/Performance/CodeQuality" +BENCHMARK_ROOT_DIR="$CORECLR_ROOT/artifacts/tests/Windows_NT.$ARCH.$BUILD/JIT/Performance/CodeQuality" BENCHMARK_SRC_DIR="$CORECLR_ROOT/tests/src/JIT/Performance/RunBenchmarks" -BENCHMARK_HOST="$CORERUN $CORECLR_ROOT/bin/tests/Windows_NT.$ARCH.$BUILD/JIT/Performance/RunBenchmarks/RunBenchmarks/RunBenchmarks.exe" +BENCHMARK_HOST="$CORERUN $CORECLR_ROOT/artifacts/tests/Windows_NT.$ARCH.$BUILD/JIT/Performance/RunBenchmarks/RunBenchmarks/RunBenchmarks.exe" BENCHMARK_RUNNER="-runner $CORERUN" # *** need to copy command files for Bytemark diff --git a/src/coreclr/tests/src/JIT/Performance/RunBenchmarks/benchmarks.xml b/src/coreclr/tests/src/JIT/Performance/RunBenchmarks/benchmarks.xml index 7ce79e0897f0ad..4f0362ddda8c29 100644 --- a/src/coreclr/tests/src/JIT/Performance/RunBenchmarks/benchmarks.xml +++ b/src/coreclr/tests/src/JIT/Performance/RunBenchmarks/benchmarks.xml @@ -549,7 +549,7 @@ TrueTypeBench TrueTypeBench - .\TrueTypeBench\bin\release + .\TrueTypeBench\artifacts\release truetypebench.exe @@ -567,14 +567,14 @@ Json Json-Serialize - .\JSON.Net\Src\Newtonsoft.Json.BenchmarkConsole\bin\Release\Net45 + .\JSON.Net\Src\Newtonsoft.Json.BenchmarkConsole\artifacts\Release\Net45 Newtonsoft.Json.BenchmarkConsole.exe Serialize-JsonNet-TestClass 1500000 > out true Json-Deserialize - .\JSON.Net\Src\Newtonsoft.Json.BenchmarkConsole\bin\Release\Net45 + .\JSON.Net\Src\Newtonsoft.Json.BenchmarkConsole\artifacts\Release\Net45 Newtonsoft.Json.BenchmarkConsole.exe Deserialize-JsonNet-String 750000 > out true diff --git a/src/coreclr/tests/src/JIT/Performance/RunBenchmarks/build.cmd b/src/coreclr/tests/src/JIT/Performance/RunBenchmarks/build.cmd index 3b8db07838ec41..3a26cfda339683 100644 --- a/src/coreclr/tests/src/JIT/Performance/RunBenchmarks/build.cmd +++ b/src/coreclr/tests/src/JIT/Performance/RunBenchmarks/build.cmd @@ -12,15 +12,15 @@ goto done :build_debug -mkdir bin\Debug\desktop >NUL 2>&1 -csc /define:DESKTOP /nologo /debug /target:exe /out:bin\Debug\desktop\RunBenchmarks.exe RunBenchmarks.cs +mkdir artifacts\Debug\desktop >NUL 2>&1 +csc /define:DESKTOP /nologo /debug /target:exe /out:artifacts\Debug\desktop\RunBenchmarks.exe RunBenchmarks.cs goto done :build_release -mkdir bin\Release\desktop >NUL 2>&1 -csc /define:DESKTOP /nologo /debug:pdbonly /target:exe /out:bin\Release\desktop\RunBenchmarks.exe RunBenchmarks.cs +mkdir artifacts\Release\desktop >NUL 2>&1 +csc /define:DESKTOP /nologo /debug:pdbonly /target:exe /out:artifacts\Release\desktop\RunBenchmarks.exe RunBenchmarks.cs goto done diff --git a/src/coreclr/tests/src/JIT/superpmi/collect_alltests.cmd b/src/coreclr/tests/src/JIT/superpmi/collect_alltests.cmd index 108b5ca93839d0..c0823cdc480c41 100644 --- a/src/coreclr/tests/src/JIT/superpmi/collect_alltests.cmd +++ b/src/coreclr/tests/src/JIT/superpmi/collect_alltests.cmd @@ -14,9 +14,9 @@ REM Everything else in this script is parameterized using the above two variable if not exist %_root% echo Error: %_root% not found&goto :eof REM Where to put the resulting MCH file? -set _mch=%_root%\bin\tests\alltests_win.mch +set _mch=%_root%\artifacts\tests\alltests_win.mch -set _testbuild=%_root%\bin\tests\%_flavor% +set _testbuild=%_root%\artifacts\tests\%_flavor% if not exist %_testbuild% echo Error: %_testbuild% not found&goto :eof if not exist %_testbuild%\JIT\superpmi\superpmicollect\superpmicollect.exe echo Error: superpmicollect.exe not found&goto :eof diff --git a/src/coreclr/tests/src/JIT/superpmi/runtests.sh b/src/coreclr/tests/src/JIT/superpmi/runtests.sh index 707cbd6b102d8f..89958d8fea7140 100755 --- a/src/coreclr/tests/src/JIT/superpmi/runtests.sh +++ b/src/coreclr/tests/src/JIT/superpmi/runtests.sh @@ -11,8 +11,8 @@ # 4. On Windows, build Linux mscorlib: build.cmd linuxmscorlib # 5. Mount Windows shares on Linux # 6. Copy tests to Linux/Mac: -# Linux: cp --recursive ~/brucefo1/ManagedCodeGen/bin/tests/Windows_NT.x64.Debug ~/test/Windows_NT.x64.Debug -# Mac : cp -R ~/brucefo1/ManagedCodeGen/bin/tests/Windows_NT.x64.Debug ~/test/Windows_NT.x64.Debug +# Linux: cp --recursive ~/brucefo1/ManagedCodeGen/artifacts/tests/Windows_NT.x64.Debug ~/test/Windows_NT.x64.Debug +# Mac : cp -R ~/brucefo1/ManagedCodeGen/artifacts/tests/Windows_NT.x64.Debug ~/test/Windows_NT.x64.Debug # 7. Run this script # # If you pass "--testDir=NONE" to runtest.sh, it will create the "test overlay" (i.e., core_root directory) @@ -28,11 +28,11 @@ UNIXARCHFLAVOR=OSX.x64.Debug ARGS="\ --testRootDir=${TESTROOT}/${WINDOWSFLAVOR} \ ---testNativeBinDir=${CORECLRROOT}/bin/obj/${UNIXARCHFLAVOR}/tests \ ---coreClrBinDir=${CORECLRROOT}/bin/Product/${UNIXARCHFLAVOR} \ ---mscorlibDir=${WINDOWSCORECLRROOT}/bin/Product/${UNIXARCHFLAVOR} \ ---coreFxBinDir=${COREFXROOT}/bin/${UNIXANYFLAVOR};${COREFXROOT}/bin/Unix.AnyCPU.Debug;${COREFXROOT}/bin/AnyOS.AnyCPU.Debug \ ---coreFxNativeBinDir=${COREFXROOT}/bin/${UNIXARCHFLAVOR}" +--testNativeBinDir=${CORECLRROOT}/artifacts/obj/${UNIXARCHFLAVOR}/tests \ +--coreClrBinDir=${CORECLRROOT}/artifacts/bin/coreclr/${UNIXARCHFLAVOR} \ +--mscorlibDir=${WINDOWSCORECLRROOT}/artifacts/bin/coreclr/${UNIXARCHFLAVOR} \ +--coreFxBinDir=${COREFXROOT}/artifacts/${UNIXANYFLAVOR};${COREFXROOT}/artifacts/Unix.AnyCPU.Debug;${COREFXROOT}/artifacts/AnyOS.AnyCPU.Debug \ +--coreFxNativeBinDir=${COREFXROOT}/artifacts/${UNIXARCHFLAVOR}" pushd ${CORECLRROOT} echo ${CORECLRROOT}/tests/runtest.sh ${ARGS} diff --git a/src/coreclr/tests/src/performance/Scenario/JitBench/Properties/launchSettings.json b/src/coreclr/tests/src/performance/Scenario/JitBench/Properties/launchSettings.json index 00a2e20e4ce30d..9b3f99640bbb04 100644 --- a/src/coreclr/tests/src/performance/Scenario/JitBench/Properties/launchSettings.json +++ b/src/coreclr/tests/src/performance/Scenario/JitBench/Properties/launchSettings.json @@ -2,7 +2,7 @@ "profiles": { "JitBench": { "commandName": "Project", - "commandLineArgs": "--perf:outputdir F:\\github\\coreclr\\bin\\sandbox_logs\\Scenarios\\On\\JitBench --perf:runid Perf-On --target-architecture x64 --perf:collect BranchMispredictions+CacheMisses+InstructionRetired" + "commandLineArgs": "--perf:outputdir F:\\github\\coreclr\\artifacts\\sandbox_logs\\Scenarios\\On\\JitBench --perf:runid Perf-On --target-architecture x64 --perf:collect BranchMispredictions+CacheMisses+InstructionRetired" } } } \ No newline at end of file diff --git a/src/coreclr/tests/src/performance/Scenario/JitBench/unofficial_dotnet/README.md b/src/coreclr/tests/src/performance/Scenario/JitBench/unofficial_dotnet/README.md index bc961abd67c8d9..5e6b5fec1f94ca 100644 --- a/src/coreclr/tests/src/performance/Scenario/JitBench/unofficial_dotnet/README.md +++ b/src/coreclr/tests/src/performance/Scenario/JitBench/unofficial_dotnet/README.md @@ -44,7 +44,7 @@ Examples of more customized ways the benchmark can be run (see the command line **Run with a private CoreCLR build instead of a downloaded one** - dotnet.exe run -- --coreclr-bin-dir F:\github\coreclr\bin\Product\Windows_NT.x64.Release + dotnet.exe run -- --coreclr-bin-dir F:\github\coreclr\artifacts\bin\coreclr\Windows_NT.x64.Release **Run multiple configurations for comparison** diff --git a/src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj b/src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj index 00c9dfb9c8deab..97007a0ee28844 100644 --- a/src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj +++ b/src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj @@ -3,10 +3,10 @@ Exe false ..\..\..\..\..\..\ - $(CoreClrDir)bin\Product\$(BuildOS).$(BuildArch).$(BuildType)\netcoreapp2.0\R2RDump.dll + $(CoreClrDir)artifacts\bin\coreclr\$(BuildOS).$(BuildArch).$(BuildType)\netcoreapp2.0\R2RDump.dll $(CoreClrDir).dotnet\dotnet ../../../../../../ - $(BashCoreClrDir)bin/Product/$(BuildOS).$(BuildArch).$(BuildType)/netcoreapp2.0/R2RDump.dll + $(BashCoreClrDir)artifacts/bin/coreclr/$(BuildOS).$(BuildArch).$(BuildType)/netcoreapp2.0/R2RDump.dll $(CoreClrDir).dotnet/dotnet $(CoreClrDir)tests\src\readytorun\r2rdump\files\$(BuildOS).$(BuildArch).$(BuildType)\ diff --git a/src/coreclr/tests/src/readytorun/r2rdump/rebaseline.cmd b/src/coreclr/tests/src/readytorun/r2rdump/rebaseline.cmd index 481721170f0fca..15ec802fbefce8 100644 --- a/src/coreclr/tests/src/readytorun/r2rdump/rebaseline.cmd +++ b/src/coreclr/tests/src/readytorun/r2rdump/rebaseline.cmd @@ -10,26 +10,26 @@ set tests=HelloWorld GcInfoTransitions GenericFunctions MultipleRuntimeFunctions (for %%a in (%tests%) do ( "%ProjectDir%dotnet.cmd" build /p:__BuildArch=x64 /p:__BuildOS=Windows_NT /p:__BuildType=Checked "%ProjectDir%tests\src\readytorun\r2rdump\files\%%a.csproj" - %ProjectDir%bin\tests\Windows_NT.x64.Checked\Tests\Core_Root\crossgen /readytorun /platform_assemblies_paths %ProjectDir%bin\tests\Windows_NT.x64.Checked\Tests\Core_Root /out %%a.ni.dll %ProjectDir%bin\tests\Windows_NT.x64.Checked\readytorun\r2rdump\files\%%a\%%a.dll - "%ProjectDir%dotnet.cmd" %ProjectDir%bin\Product\Windows_NT.x64.Checked\netcoreapp2.0\R2RDump.dll --in %%a.ni.dll --out %ProjectDir%tests\src\readytorun\r2rdump\files\Windows_NT.x64.Checked\%%a.xml -x -v --ignoreSensitive + %ProjectDir%artifacts\tests\Windows_NT.x64.Checked\Tests\Core_Root\crossgen /readytorun /platform_assemblies_paths %ProjectDir%artifacts\tests\Windows_NT.x64.Checked\Tests\Core_Root /out %%a.ni.dll %ProjectDir%artifacts\tests\Windows_NT.x64.Checked\readytorun\r2rdump\files\%%a\%%a.dll + "%ProjectDir%dotnet.cmd" %ProjectDir%artifacts\bin\coreclr\Windows_NT.x64.Checked\netcoreapp2.0\R2RDump.dll --in %%a.ni.dll --out %ProjectDir%tests\src\readytorun\r2rdump\files\Windows_NT.x64.Checked\%%a.xml -x -v --ignoreSensitive )) (for %%a in (%tests%) do ( "%ProjectDir%dotnet.cmd" build /p:__BuildArch=x64 /p:__BuildOS=Windows_NT /p:__BuildType=Debug "%ProjectDir%tests\src\readytorun\r2rdump\files\%%a.csproj" - %ProjectDir%bin\tests\Windows_NT.x64.Debug\Tests\Core_Root\crossgen /readytorun /platform_assemblies_paths %ProjectDir%bin\tests\Windows_NT.x64.Debug\Tests\Core_Root /out %%a.ni.dll %ProjectDir%bin\tests\Windows_NT.x64.Debug\readytorun\r2rdump\files\%%a\%%a.dll - "%ProjectDir%dotnet.cmd" %ProjectDir%bin\Product\Windows_NT.x64.Debug\netcoreapp2.0\R2RDump.dll --in %%a.ni.dll --out %ProjectDir%tests\src\readytorun\r2rdump\files\Windows_NT.x64.Debug\%%a.xml -x -v --ignoreSensitive + %ProjectDir%artifacts\tests\Windows_NT.x64.Debug\Tests\Core_Root\crossgen /readytorun /platform_assemblies_paths %ProjectDir%artifacts\tests\Windows_NT.x64.Debug\Tests\Core_Root /out %%a.ni.dll %ProjectDir%artifacts\tests\Windows_NT.x64.Debug\readytorun\r2rdump\files\%%a\%%a.dll + "%ProjectDir%dotnet.cmd" %ProjectDir%artifacts\bin\coreclr\Windows_NT.x64.Debug\netcoreapp2.0\R2RDump.dll --in %%a.ni.dll --out %ProjectDir%tests\src\readytorun\r2rdump\files\Windows_NT.x64.Debug\%%a.xml -x -v --ignoreSensitive )) (for %%a in (%tests%) do ( "%ProjectDir%dotnet.cmd" build /p:__BuildArch=x86 /p:__BuildOS=Windows_NT /p:__BuildType=Release "%ProjectDir%tests\src\readytorun\r2rdump\files\%%a.csproj" - %ProjectDir%bin\tests\Windows_NT.x86.Release\Tests\Core_Root\crossgen /readytorun /platform_assemblies_paths %ProjectDir%bin\tests\Windows_NT.x86.Release\Tests\Core_Root /out %%a.ni.dll %ProjectDir%bin\tests\Windows_NT.x86.Release\readytorun\r2rdump\files\%%a\%%a.dll - "%ProjectDir%dotnet.cmd" %ProjectDir%bin\Product\Windows_NT.x86.Release\netcoreapp2.0\R2RDump.dll --in %%a.ni.dll --out %ProjectDir%tests\src\readytorun\r2rdump\files\Windows_NT.x86.Release\%%a.xml -x -v --ignoreSensitive + %ProjectDir%artifacts\tests\Windows_NT.x86.Release\Tests\Core_Root\crossgen /readytorun /platform_assemblies_paths %ProjectDir%artifacts\tests\Windows_NT.x86.Release\Tests\Core_Root /out %%a.ni.dll %ProjectDir%artifacts\tests\Windows_NT.x86.Release\readytorun\r2rdump\files\%%a\%%a.dll + "%ProjectDir%dotnet.cmd" %ProjectDir%artifacts\bin\coreclr\Windows_NT.x86.Release\netcoreapp2.0\R2RDump.dll --in %%a.ni.dll --out %ProjectDir%tests\src\readytorun\r2rdump\files\Windows_NT.x86.Release\%%a.xml -x -v --ignoreSensitive )) (for %%a in (%tests%) do ( "%ProjectDir%dotnet.cmd" build /p:__BuildArch=x86 /p:__BuildOS=Windows_NT /p:__BuildType=Debug "%ProjectDir%tests\src\readytorun\r2rdump\files\%%a.csproj" - %ProjectDir%bin\tests\Windows_NT.x86.Debug\Tests\Core_Root\crossgen /readytorun /platform_assemblies_paths %ProjectDir%bin\tests\Windows_NT.x86.Debug\Tests\Core_Root /out %%a.ni.dll %ProjectDir%bin\tests\Windows_NT.x86.Debug\readytorun\r2rdump\files\%%a\%%a.dll - "%ProjectDir%dotnet.cmd" %ProjectDir%bin\Product\Windows_NT.x86.Debug\netcoreapp2.0\R2RDump.dll --in %%a.ni.dll --out %ProjectDir%tests\src\readytorun\r2rdump\files\Windows_NT.x86.Debug\%%a.xml -x -v --ignoreSensitive + %ProjectDir%artifacts\tests\Windows_NT.x86.Debug\Tests\Core_Root\crossgen /readytorun /platform_assemblies_paths %ProjectDir%artifacts\tests\Windows_NT.x86.Debug\Tests\Core_Root /out %%a.ni.dll %ProjectDir%artifacts\tests\Windows_NT.x86.Debug\readytorun\r2rdump\files\%%a\%%a.dll + "%ProjectDir%dotnet.cmd" %ProjectDir%artifacts\bin\coreclr\Windows_NT.x86.Debug\netcoreapp2.0\R2RDump.dll --in %%a.ni.dll --out %ProjectDir%tests\src\readytorun\r2rdump\files\Windows_NT.x86.Debug\%%a.xml -x -v --ignoreSensitive )) COPY /Y %ProjectDir%tests\src\readytorun\r2rdump\files\Windows_NT.x64.Checked\*.xml %ProjectDir%tests\src\readytorun\r2rdump\files\Windows_NT.x64.Release\ diff --git a/src/coreclr/tests/src/runtest.proj b/src/coreclr/tests/src/runtest.proj index 0736ac725b3c05..d3f17557223a8c 100644 --- a/src/coreclr/tests/src/runtest.proj +++ b/src/coreclr/tests/src/runtest.proj @@ -354,7 +354,7 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). - + diff --git a/src/coreclr/tests/tests.targets b/src/coreclr/tests/tests.targets index e8d0192f3540e6..1d9ec9d8f2f1ad 100644 --- a/src/coreclr/tests/tests.targets +++ b/src/coreclr/tests/tests.targets @@ -69,7 +69,6 @@ $(CorerunExecutable) $(XunitConsoleRunner) @(TestAssemblies->'%(Identity)', ' ') $(XunitArgs) -