From 69c50316b0f3a1016783c4688c40220c76ea7c09 Mon Sep 17 00:00:00 2001 From: jashook Date: Thu, 14 Nov 2019 14:26:46 -0800 Subject: [PATCH 01/27] Use artifacts layout in place of bin dir --- docs/coreclr/building/android.md | 4 ++-- docs/coreclr/building/cross-building.md | 22 +++++++++---------- .../building/debugging-instructions.md | 4 ++-- docs/coreclr/building/freebsd-instructions.md | 12 +++++----- docs/coreclr/building/linux-instructions.md | 6 ++--- docs/coreclr/building/netbsd-instructions.md | 8 +++---- docs/coreclr/building/osx-instructions.md | 6 ++--- docs/coreclr/building/testing-with-corefx.md | 4 ++-- .../building/unix-test-instructions.md | 2 +- docs/coreclr/building/viewing-jit-dumps.md | 14 ++++++------ docs/coreclr/building/windows-instructions.md | 4 ++-- .../building/windows-test-instructions.md | 12 +++++----- .../project-docs/linux-performance-tracing.md | 2 +- docs/coreclr/workflow/UsingCoreRun.md | 6 ++--- docs/coreclr/workflow/UsingDotNetCli.md | 6 ++--- docs/coreclr/workflow/UsingYourBuild.md | 8 +++---- src/coreclr/CMakeLists.txt | 2 +- src/coreclr/_build-commons.sh | 2 +- src/coreclr/build-packages.cmd | 2 +- src/coreclr/build-packages.sh | 2 +- src/coreclr/build-test.cmd | 4 ++-- src/coreclr/build-test.sh | 4 ++-- src/coreclr/build.cmd | 4 ++-- src/coreclr/build.sh | 4 ++-- src/coreclr/dir.common.props | 2 +- src/coreclr/scripts/coreclr_arguments.py | 4 ++-- src/coreclr/scripts/superpmi.py | 16 +++++++------- src/coreclr/src/dlls/mscordac/CMakeLists.txt | 2 +- src/coreclr/src/inc/CrstTypeTool.cs | 2 +- src/coreclr/src/inc/crsttypes.h | 2 +- src/coreclr/src/inc/readme.md | 4 ++-- src/coreclr/src/pal/tools/set-cmake-path.ps1 | 2 +- .../src/tools/GCLogParser/parse-hb-log.csproj | 8 +++---- .../Commands/CompileNugetCommand.cs | 2 +- .../Commands/CompileSubtreeCommand.cs | 2 +- ...ompiler.DependencyAnalysisFramework.csproj | 2 +- .../ILCompiler.ReadyToRun.csproj | 2 +- .../ILCompiler.TypeSystem.ReadyToRun.csproj | 2 +- .../crossgen2/crossgen2/crossgen2.csproj | 2 +- .../src/vm/.vscode/c_cpp_properties.json | 8 +++---- src/coreclr/tests/Directory.Build.props | 4 ++-- src/coreclr/tests/bringup_runtest.sh | 18 +++++++-------- src/coreclr/tests/dir.common.props | 6 ++--- src/coreclr/tests/override.targets | 2 +- src/coreclr/tests/publishdependency.targets | 2 +- src/coreclr/tests/runparallel.sh | 2 +- src/coreclr/tests/runtest.cmd | 4 ++-- src/coreclr/tests/runtest.py | 14 ++++++------ src/coreclr/tests/runtest.sh | 10 ++++----- src/coreclr/tests/scripts/build_illink.cmd | 2 +- src/coreclr/tests/scripts/build_illink.sh | 2 +- .../tests/scripts/crossgen_comparison.py | 10 ++++----- .../scripts/run-gc-reliability-framework.cmd | 4 ++-- .../scripts/run-gc-reliability-framework.sh | 4 ++-- src/coreclr/tests/scripts/run-pmi-diffs.py | 4 ++-- src/coreclr/tests/scripts/x86_ci_script.sh | 4 ++-- .../tests/setup-stress-dependencies.cmd | 2 +- .../tests/setup-stress-dependencies.sh | 2 +- src/coreclr/tests/src/Directory.Build.props | 4 ++-- .../src/JIT/CheckProjects/CheckProjects.cs | 4 ++-- .../RunBenchmarks/RunBenchmarks.cmd | 6 ++--- .../RunBenchmarks/RunBenchmarks.sh | 4 ++-- .../Performance/RunBenchmarks/benchmarks.xml | 6 ++--- .../JIT/Performance/RunBenchmarks/build.cmd | 8 +++---- .../src/JIT/superpmi/collect_alltests.cmd | 4 ++-- .../tests/src/JIT/superpmi/runtests.sh | 14 ++++++------ .../JitBench/Properties/launchSettings.json | 2 +- .../JitBench/unofficial_dotnet/README.md | 2 +- .../src/readytorun/r2rdump/R2RDumpTest.csproj | 4 ++-- .../src/readytorun/r2rdump/rebaseline.cmd | 16 +++++++------- src/coreclr/tests/src/runtest.proj | 2 +- 71 files changed, 189 insertions(+), 189 deletions(-) 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/src/coreclr/CMakeLists.txt b/src/coreclr/CMakeLists.txt index 50fec2a4640448..16b3e0c2ffb24d 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") 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 ad1314e50f0074..a8cac53f498e10 100644 --- a/src/coreclr/build-packages.cmd +++ b/src/coreclr/build-packages.cmd @@ -37,7 +37,7 @@ if [!processedArgs!]==[] ( :ArgsDone -set logFile=%__RepoRootDir%bin\Logs\build-packages.binlog +set logFile=%__RepoRootDir%artifacts\logs\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 41c99438390193..71aa9ca20d0ad3 100755 --- a/src/coreclr/build-packages.sh +++ b/src/coreclr/build-packages.sh @@ -133,7 +133,7 @@ if [ "${__DistroRid}" = "linux-musl-arm64" ]; then export OutputRID=${__DistroRid} fi -logFile=$__ProjectRoot/bin/Logs/build-packages.binlog +logFile=$__ProjectRoot/artifacts/logs/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 435a08937d7adc..346afaab9f7450 100644 --- a/src/coreclr/build-test.cmd +++ b/src/coreclr/build-test.cmd @@ -39,8 +39,8 @@ if not exist "%__RepoRootDir%\.dotnet-runtime-placeholder" ( set "__RepoRootDir= set "__TestDir=%__ProjectDir%\tests" set "__ProjectFilesDir=%__TestDir%" set "__SourceDir=%__ProjectDir%\src" -set "__RootBinDir=%__ProjectDir%\bin" -set "__LogsDir=%__RootBinDir%\Logs" +set "__RootBinDir=%__ProjectDir%\artifacts" +set "__LogsDir=%__RootBinDir\%logs" set "__MsbuildDebugLogsDir=%__LogsDir%\MsbuildDebugLogs" :: Default __Exclude to issues.targets diff --git a/src/coreclr/build-test.sh b/src/coreclr/build-test.sh index f85be52b921f98..a1064be42bea47 100755 --- a/src/coreclr/build-test.sh +++ b/src/coreclr/build-test.sh @@ -681,7 +681,7 @@ __MSBCleanBuildArgs= __NativeTestIntermediatesDir= __PortableBuild=1 __RebuildTests=0 -__RootBinDir="$__ProjectDir/bin" +__RootBinDir="$__ProjectDir/artifacts" __RunTests=0 __SkipConfigure=0 __SkipGenerateLayout=0 @@ -702,7 +702,7 @@ CORE_ROOT= source "$__ProjectRoot"/_build-commons.sh # Set dependent variables -__LogsDir="$__RootBinDir/Logs" +__LogsDir="$__RootBinDirlogs" __MsbuildDebugLogsDir="$__LogsDir/MsbuildDebugLogs" # Set the remaining variables based upon the determined build configuration diff --git a/src/coreclr/build.cmd b/src/coreclr/build.cmd index e2a66636b39710..1736013f0b8c2c 100644 --- a/src/coreclr/build.cmd +++ b/src/coreclr/build.cmd @@ -58,8 +58,8 @@ if not exist "%__RepoRootDir%\.dotnet-runtime-placeholder" ( set "__RepoRootDir= set "__ProjectFilesDir=%__ProjectDir%" set "__SourceDir=%__ProjectDir%\src" -set "__RootBinDir=%__ProjectDir%\bin" -set "__LogsDir=%__RootBinDir%\Logs" +set "__RootBinDir=%__ProjectDir%\artifacts" +set "__LogsDir=%__RootBinDir%logs" set "__MsbuildDebugLogsDir=%__LogsDir%\MsbuildDebugLogs" set __BuildAll= diff --git a/src/coreclr/build.sh b/src/coreclr/build.sh index 635258eaec6df1..378a753aa0633d 100755 --- a/src/coreclr/build.sh +++ b/src/coreclr/build.sh @@ -614,7 +614,7 @@ __PgoOptDataPath="" __PgoOptimize=1 __PortableBuild=1 __ProjectDir="$__ProjectRoot" -__RootBinDir="$__ProjectDir/bin" +__RootBinDir="$__ProjectDir/artifacts" __SignTypeArg="" __SkipConfigure=0 __SkipCoreCLR=0 @@ -643,7 +643,7 @@ if [ "${__BuildArch}" != "${__HostArch}" ]; then fi # Set dependent variables -__LogsDir="$__RootBinDir/Logs" +__LogsDir="$__RootBinDirlogs" __MsbuildDebugLogsDir="$__LogsDir/MsbuildDebugLogs" # Set the remaining variables based upon the determined build configuration diff --git a/src/coreclr/dir.common.props b/src/coreclr/dir.common.props index a071e1055a8365..0999ff1cd77a68 100644 --- a/src/coreclr/dir.common.props +++ b/src/coreclr/dir.common.props @@ -45,7 +45,7 @@ $(ProjectDir)src\ $(__RootBinDir)\ - $(ProjectDir)bin\ + $(ProjectDir)artifacts\ $(__BinDir)\ $(RootBinDir)Product\$(PlatformConfigPathPart)\ diff --git a/src/coreclr/scripts/coreclr_arguments.py b/src/coreclr/scripts/coreclr_arguments.py index d207061110b8f1..a1e520cb569e84 100644 --- a/src/coreclr/scripts/coreclr_arguments.py +++ b/src/coreclr/scripts/coreclr_arguments.py @@ -205,7 +205,7 @@ def provide_default_host_os(): return None def check_and_return_test_location(test_location): - default_test_location = os.path.join(self.coreclr_repo_location, "bin", "tests", "%s.%s.%s" % (self.host_os, self.arch, self.build_type)) + default_test_location = os.path.join(self.coreclr_repo_location, "artifacts", "tests", "%s.%s.%s" % (self.host_os, self.arch, self.build_type)) if os.path.isdir(default_test_location) or not self.require_built_test_dir: return default_test_location @@ -237,7 +237,7 @@ def check_and_return_default_product_location(product_location): return product_location self.coreclr_repo_location = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) - self.bin_location = os.path.join(self.coreclr_repo_location, "bin") + self.bin_location = os.path.join(self.coreclr_repo_location, "artifacts") self.verify(args, "host_os", diff --git a/src/coreclr/scripts/superpmi.py b/src/coreclr/scripts/superpmi.py index 8ef2a6a6c59641..b44c985a03a973 100755 --- a/src/coreclr/scripts/superpmi.py +++ b/src/coreclr/scripts/superpmi.py @@ -85,7 +85,7 @@ collect_parser.add_argument("-product_location", dest="product_location", nargs='?', default=None, help="Location of the built product, this is optional.") collect_parser.add_argument("-coreclr_repo_location", dest="coreclr_repo_location", default=os.path.dirname(os.path.dirname(os.path.abspath(__file__))), help="Location of the coreclr repo. Optional.") collect_parser.add_argument("-test_env", dest="test_env", default=None, help="Test env to pass to the coreclr tests if collecting over the tests.") -collect_parser.add_argument("-output_mch_path", dest="output_mch_path", default=None, help="Location to drop the final mch file. By default it will drop to bin/mch/$(buildType).$(arch).$(config)/$(buildType).$(arch).$(config).mch") +collect_parser.add_argument("-output_mch_path", dest="output_mch_path", default=None, help="Location to drop the final mch file. By default it will drop to artifacts/mch/$(buildType).$(arch).$(config)/$(buildType).$(arch).$(config).mch") collect_parser.add_argument("--pmi", dest="pmi", default=False, action="store_true", help="Use pmi on a set of directories or assemblies") collect_parser.add_argument("-mch_files", dest="mch_files", nargs='+', default=None, help="Pass a sequence of mch files which will be merged.") @@ -810,11 +810,11 @@ def replay(self): with open(self.fail_mcl_file) as file_handle: self.fail_mcl_contents = file_handle.read() - # If there are any .mc files, drop them into bin/repro/../*.mc + # If there are any .mc files, drop them into artifacts/repro/../*.mc mc_files = [os.path.join(temp_location, item) for item in os.listdir(temp_location) if item.endswith(".mc")] if len(mc_files) > 0: - repro_location = os.path.join(self.coreclr_args.coreclr_repo_location, "bin", "repro", "{}.{}.{}".format(self.coreclr_args.host_os, self.coreclr_args.arch, self.coreclr_args.build_type)) + repro_location = os.path.join(self.coreclr_args.coreclr_repo_location, "artifacts", "repro", "{}.{}.{}".format(self.coreclr_args.host_os, self.coreclr_args.arch, self.coreclr_args.build_type)) # Delete existing repro location if os.path.isdir(repro_location): @@ -840,7 +840,7 @@ def replay(self): print("To run an specific failure:") print("") - print("/SuperPMI /clrjit.dll|libclrjit.so|libclrjit.dylib </bin/repro/../1xxxx.mc") + print("/SuperPMI /clrjit.dll|libclrjit.so|libclrjit.dylib </artifacts/repro/../1xxxx.mc") print("") else: @@ -1011,11 +1011,11 @@ def replay_with_asm_diffs(self, previous_temp_location=None): mcl_lines = [item.strip() for item in mcl_lines] self.fail_mcl_contents = os.linesep.join(mcl_lines) - # If there are any .mc files, drop them into bin/repro/../*.mc + # If there are any .mc files, drop them into artifacts/repro/../*.mc mc_files = [os.path.join(temp_location, item) for item in os.listdir(temp_location) if item.endswith(".mc")] if len(mc_files) > 0: - repro_location = os.path.join(self.coreclr_args.coreclr_repo_location, "bin", "repro", "{}.{}.{}".format(self.coreclr_args.host_os, self.coreclr_args.arch, self.coreclr_args.build_type)) + repro_location = os.path.join(self.coreclr_args.coreclr_repo_location, "artifacts", "repro", "{}.{}.{}".format(self.coreclr_args.host_os, self.coreclr_args.arch, self.coreclr_args.build_type)) # Delete existing repro location if os.path.isdir(repro_location): @@ -1041,7 +1041,7 @@ def replay_with_asm_diffs(self, previous_temp_location=None): print("To run an specific failure:") print("") - print("/SuperPMI /clrjit.dll|libclrjit.so|libclrjit.dylib </bin/repro/../1xxxx.mc") + print("/SuperPMI /clrjit.dll|libclrjit.so|libclrjit.dylib </artifacts/repro/../1xxxx.mc") print("") print(self.fail_mcl_contents) @@ -1411,7 +1411,7 @@ async def create_jit_dump(print_prefix, item, self, jit_dump_differences, base_d current_jit_dump_diff = None if current_jit_dump_diff is not None: - print("Diffs found in the JitDump generated. These files are located under /bin/jit_dump/base and /bin/jit_dump/diff") + print("Diffs found in the JitDump generated. These files are located under /artifacts/jit_dump/base and /artifacts/jit_dump/diff") print("") print("Method numbers with textual differences:") diff --git a/src/coreclr/src/dlls/mscordac/CMakeLists.txt b/src/coreclr/src/dlls/mscordac/CMakeLists.txt index cbb194e52de86e..cd34fde3e32158 100644 --- a/src/coreclr/src/dlls/mscordac/CMakeLists.txt +++ b/src/coreclr/src/dlls/mscordac/CMakeLists.txt @@ -193,7 +193,7 @@ if(WIN32) set(LONG_NAME_HOST_ARCH "amd64") set(LONG_NAME_TARGET_ARCH "amd64") endif() - set(NATIVE_VERSION_HEADER_FILE "${CLR_DIR}/bin/obj/_version.h") + set(NATIVE_VERSION_HEADER_FILE "${CLR_DIR}/artifacts/obj/_version.h") message ("Read file version from native version header at '${NATIVE_VERSION_HEADER_FILE}'.") file(READ "${NATIVE_VERSION_HEADER_FILE}" NATIVE_VERSION_HEADER) string(REGEX MATCH "#define VER_FILEVERSION[ \t]+[0-9]+(,[0-9]+)+" FILE_VERSION_LINE "${NATIVE_VERSION_HEADER}") diff --git a/src/coreclr/src/inc/CrstTypeTool.cs b/src/coreclr/src/inc/CrstTypeTool.cs index 4f9ecb27835dde..788c7efcaccb2a 100644 --- a/src/coreclr/src/inc/CrstTypeTool.cs +++ b/src/coreclr/src/inc/CrstTypeTool.cs @@ -143,7 +143,7 @@ void WriteHeaderFile(string fileName) writer.WriteLine(); writer.WriteLine("// This file describes the range of Crst types available and their mapping to a numeric level (used by the"); writer.WriteLine("// runtime in debug mode to validate we're deadlock free). To modify these settings edit the"); - writer.WriteLine("// file:CrstTypes.def file and run the clr\\bin\\CrstTypeTool utility to generate a new version of this file."); + writer.WriteLine("// file:CrstTypes.def file and run the clr\\artifacts\\CrstTypeTool utility to generate a new version of this file."); writer.WriteLine(); // Emit the CrstType enum to define a value for each crst type (along with the kNumberOfCrstTypes diff --git a/src/coreclr/src/inc/crsttypes.h b/src/coreclr/src/inc/crsttypes.h index 70e40eb3746498..ae003653cc0fd1 100644 --- a/src/coreclr/src/inc/crsttypes.h +++ b/src/coreclr/src/inc/crsttypes.h @@ -11,7 +11,7 @@ // This file describes the range of Crst types available and their mapping to a numeric level (used by the // runtime in debug mode to validate we're deadlock free). To modify these settings edit the -// file:CrstTypes.def file and run the clr\bin\CrstTypeTool utility to generate a new version of this file. +// file:CrstTypes.def file and run the clr\artifacts\CrstTypeTool utility to generate a new version of this file. // Each Crst type is declared as a value in the following CrstType enum. enum CrstType diff --git a/src/coreclr/src/inc/readme.md b/src/coreclr/src/inc/readme.md index 719401cb8e430b..1e7754ea5e07b0 100644 --- a/src/coreclr/src/inc/readme.md +++ b/src/coreclr/src/inc/readme.md @@ -4,9 +4,9 @@ This directory has a variety of .idl files (such as corprof.idl) that need a lit the build rules would automatically convert the idls into corresponding .h/.c files and include them in compilations. On non-windows platforms we don't have an equivalent for midl.exe which did that conversion so we work around the issue by doing: -- Build on Windows as normal, which will generate files in bin\obj\Windows_NT.x64.Debug\src\inc\idls_out\ +- Build on Windows as normal, which will generate files in artifacts\obj\Windows_NT.x64.Debug\src\inc\idls_out\ - Copy any updated headers into src\pal\prebuilt\inc\ -- If needed, adjust any of the .cpp files in src\pal\prebuilt\idl\ by hand, using the corresponding bin\obj\Windows_NT.x64.Debug\src\inc\idls_out\*_i.c as a guide. Typically +- If needed, adjust any of the .cpp files in src\pal\prebuilt\idl\ by hand, using the corresponding artifacts\obj\Windows_NT.x64.Debug\src\inc\idls_out\*_i.c as a guide. Typically this is just adding MIDL_DEFINE_GUID(...) for any new classes/interfaces that have been added to the idl file. Include these src changes with the remainder of your work when you submit a PR. \ No newline at end of file diff --git a/src/coreclr/src/pal/tools/set-cmake-path.ps1 b/src/coreclr/src/pal/tools/set-cmake-path.ps1 index b05dc8fa5f7c2e..f367ad127c3ff7 100644 --- a/src/coreclr/src/pal/tools/set-cmake-path.ps1 +++ b/src/coreclr/src/pal/tools/set-cmake-path.ps1 @@ -24,7 +24,7 @@ function GetCMakeInfo($regKey) else { $cmakeDir = $itemProperty.'(default)' } - $cmakePath = [System.IO.Path]::Combine($cmakeDir, "bin\cmake.exe") + $cmakePath = [System.IO.Path]::Combine($cmakeDir, "artifacts\cmake.exe") if (![System.IO.File]::Exists($cmakePath)) { return $null } diff --git a/src/coreclr/src/tools/GCLogParser/parse-hb-log.csproj b/src/coreclr/src/tools/GCLogParser/parse-hb-log.csproj index 2c8953b984a45b..940cb96f0ea3bc 100644 --- a/src/coreclr/src/tools/GCLogParser/parse-hb-log.csproj +++ b/src/coreclr/src/tools/GCLogParser/parse-hb-log.csproj @@ -18,7 +18,7 @@ true full false - bin\Debug\ + artifacts\Debug\ DEBUG;TRACE prompt 4 @@ -27,14 +27,14 @@ AnyCPU pdbonly true - bin\Release\ + artifacts\Release\ TRACE prompt 4 true - bin\x64\Debug\ + artifacts\x64\Debug\ DEBUG;TRACE full x64 @@ -43,7 +43,7 @@ true - bin\x64\Release\ + artifacts\x64\Release\ TRACE true pdbonly diff --git a/src/coreclr/src/tools/ReadyToRun.SuperIlc/Commands/CompileNugetCommand.cs b/src/coreclr/src/tools/ReadyToRun.SuperIlc/Commands/CompileNugetCommand.cs index d1a56425bff0aa..9a477c1f7b8f87 100644 --- a/src/coreclr/src/tools/ReadyToRun.SuperIlc/Commands/CompileNugetCommand.cs +++ b/src/coreclr/src/tools/ReadyToRun.SuperIlc/Commands/CompileNugetCommand.cs @@ -81,7 +81,7 @@ public static int CompileNuget(BuildOptions options) } // This is not a reliable way of building the publish folder - string publishFolder = Path.Combine(appFolder, @"bin\Debug\netcoreapp3.0\publish"); + string publishFolder = Path.Combine(appFolder, @"artifacts\Debug\netcoreapp3.0\publish"); if (!Directory.Exists(publishFolder)) { nugetLog.WriteLine($"Could not find folder {publishFolder} containing the published app."); diff --git a/src/coreclr/src/tools/ReadyToRun.SuperIlc/Commands/CompileSubtreeCommand.cs b/src/coreclr/src/tools/ReadyToRun.SuperIlc/Commands/CompileSubtreeCommand.cs index dfc5c88bc33ba7..089bbf9460c5fb 100644 --- a/src/coreclr/src/tools/ReadyToRun.SuperIlc/Commands/CompileSubtreeCommand.cs +++ b/src/coreclr/src/tools/ReadyToRun.SuperIlc/Commands/CompileSubtreeCommand.cs @@ -116,7 +116,7 @@ public static int CompileSubtree(BuildOptions options) private static string[] LocateSubtree(string folder, string coreRootFolder) { ConcurrentBag directories = new ConcurrentBag(); - // TODO: this is somewhat hacky - should we introduce a new option -bt (bin/tests/OS.arch.config) we'd use + // TODO: this is somewhat hacky - should we introduce a new option -bt (artifacts/tests/OS.arch.config) we'd use // to derive the location of Core_Root and testhost? string testHostFolder = Path.Combine(Path.GetDirectoryName(Path.GetDirectoryName(coreRootFolder)), "testhost"); LocateSubtreeAsync(folder, coreRootFolder, testHostFolder, directories).Wait(); diff --git a/src/coreclr/src/tools/crossgen2/ILCompiler.DependencyAnalysisFramework/ILCompiler.DependencyAnalysisFramework.csproj b/src/coreclr/src/tools/crossgen2/ILCompiler.DependencyAnalysisFramework/ILCompiler.DependencyAnalysisFramework.csproj index 696e59308f3575..81f4d5d5fb6331 100644 --- a/src/coreclr/src/tools/crossgen2/ILCompiler.DependencyAnalysisFramework/ILCompiler.DependencyAnalysisFramework.csproj +++ b/src/coreclr/src/tools/crossgen2/ILCompiler.DependencyAnalysisFramework/ILCompiler.DependencyAnalysisFramework.csproj @@ -10,7 +10,7 @@ false 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..059b4750890b97 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/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/Windows_NT.x64.Debug/src/inc", + "../../artifacts/obj/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..deb9368973628a 100644 --- a/src/coreclr/tests/Directory.Build.props +++ b/src/coreclr/tests/Directory.Build.props @@ -21,7 +21,7 @@ $(__RootBinDir)\ - $(ProjectDir)..\bin\ + $(ProjectDir)..\artifacts\ $(__BinDir)\ $(RootBinDir)Product\$(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..a4c7d714e03ebd 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="coreclr/artifacts/obj/Linux.x64.Debug/tests"' + echo ' --coreOverlayDir="coreclr/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. coreclr/artifacts/tests/Windows_NT.x64.Debug).' + echo ' --testNativeBinDir= : Directory of the native CoreCLR test build (e.g. coreclr/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. coreclr/artifacts/Product/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}logs/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..bc95bd97338d97 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) + $(CoreclrDir)/artifacts/tests/obj/$(OSPlatformConfig)/Managed/$(BuildProjectRelativeDir) $(BaseIntermediateOutputPath) - $(CoreclrDir)/bin/tests/$(OSPlatformConfig)/$(BuildProjectRelativeDir) + $(CoreclrDir)/artifacts/tests/$(OSPlatformConfig)/$(BuildProjectRelativeDir) $(BaseOutputPath) diff --git a/src/coreclr/tests/override.targets b/src/coreclr/tests/override.targets index a713489fc36ce4..a2a3f7a8c4eeac 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..d43d798ca306d0 100644 --- a/src/coreclr/tests/publishdependency.targets +++ b/src/coreclr/tests/publishdependency.targets @@ -36,7 +36,7 @@ - $(ProjectDir)\..\bin\Product\$(BuildOS).$(BuildArch).$(BuildType) + $(ProjectDir)\..\artifacts\Product\$(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..3ad22d02fde588 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%\logs" set "__MsbuildDebugLogsDir=%__LogsDir%\MsbuildDebugLogs" set __ToolsDir=%__ProjectDir%\..\Tools set "DotNetCli=%__ProjectDir%\..\dotnet.cmd" diff --git a/src/coreclr/tests/runtest.py b/src/coreclr/tests/runtest.py index c90e059c27e64f..2d7f1c465954e0 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..d2090c955c3afe 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. coreclr/artifacts/tests/Windows_NT.x64.Debug).' + echo ' --testNativeBinDir= : Directory of the native CoreCLR test build (e.g. coreclr/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. coreclr/artifacts/Product/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).' @@ -64,7 +64,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 @@ -92,7 +92,7 @@ function create_testhost esac local coreFXTestExecutable=xunit.console.netcore.exe - local coreFXLogDir=${coreClrBinDir}/Logs/CoreFX/ + local coreFXLogDir=${coreClrBinDir}logs/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/build_illink.cmd b/src/coreclr/tests/scripts/build_illink.cmd index ce9f28542235c6..11b43c374ac654 100644 --- a/src/coreclr/tests/scripts/build_illink.cmd +++ b/src/coreclr/tests/scripts/build_illink.cmd @@ -25,7 +25,7 @@ cd ..\linker ..\corebuild\dotnet.cmd publish -r %rid% -c netcore_Release popd -echo Built %cd%\linker\linker\bin\netcore_Release\netcoreapp2.0\%rid%\publish\illink.exe +echo Built %cd%\linker\linker\artifacts\netcore_Release\netcoreapp2.0\%rid%\publish\illink.exe :Done exit /b 0 diff --git a/src/coreclr/tests/scripts/build_illink.sh b/src/coreclr/tests/scripts/build_illink.sh index 23c1382f593cea..26fae14bc7a260 100755 --- a/src/coreclr/tests/scripts/build_illink.sh +++ b/src/coreclr/tests/scripts/build_illink.sh @@ -59,7 +59,7 @@ cd ../linker popd dir=$(pwd) -output="$dir/linker/linker/bin/netcore_Release/netcoreapp2.0/$rid/publish/illink" +output="$dir/linker/linker/artifacts/netcore_Release/netcoreapp2.0/$rid/publish/illink" echo Built $output exit $EXIT_CODE_SUCCESS diff --git a/src/coreclr/tests/scripts/crossgen_comparison.py b/src/coreclr/tests/scripts/crossgen_comparison.py index 892775fbe5c2b3..df14d6854e051e 100644 --- a/src/coreclr/tests/scripts/crossgen_comparison.py +++ b/src/coreclr/tests/scripts/crossgen_comparison.py @@ -23,8 +23,8 @@ # The following command # # ~/git/coreclr$ python tests/scripts/crossgen_comparison.py crossgen_corelib -# --crossgen bin/Product/Linux.arm.Checked/crossgen -# --il_corelib bin/Product/Linux.arm.Checked/IL/System.Private.CoreLib.dll +# --crossgen artifacts/Product/Linux.arm.Checked/crossgen +# --il_corelib artifacts/Product/Linux.arm.Checked/IL/System.Private.CoreLib.dll # --result_dir Linux.arm_arm.Checked # # runs Hostarm/arm crossgen on System.Private.CoreLib.dll and puts all the @@ -60,12 +60,12 @@ # The following command # # ~/git/coreclr$ python tests/scripts/crossgen_comparison.py crossgen_dotnet_sdk -# --crossgen bin/Product/Linux.arm.Checked/x64/crossgen -# --il_corelib bin/Product/Linux.arm.Checked/IL/System.Private.CoreLib.dll +# --crossgen artifacts/Product/Linux.arm.Checked/x64/crossgen +# --il_corelib artifacts/Product/Linux.arm.Checked/IL/System.Private.CoreLib.dll # --dotnet_sdk dotnet-sdk-latest-linux-arm.tar.gz # --result_dir Linux.x64_arm.Checked # -# runs Hostx64/arm crossgen on System.Private.CoreLib.dll in bin/Product and on +# runs Hostx64/arm crossgen on System.Private.CoreLib.dll in artifacts/Product and on # all the assemblies inside dotnet-sdk-latest-linux-arm.tar.gz and stores the # collected information in directory Linux.x64_arm.Checked # diff --git a/src/coreclr/tests/scripts/run-gc-reliability-framework.cmd b/src/coreclr/tests/scripts/run-gc-reliability-framework.cmd index d8d15afcca41e5..6d9dd984b6fc05 100644 --- a/src/coreclr/tests/scripts/run-gc-reliability-framework.cmd +++ b/src/coreclr/tests/scripts/run-gc-reliability-framework.cmd @@ -4,8 +4,8 @@ @echo off -set CORE_ROOT=%CD%\bin\tests\Windows_NT.%1.%2\Tests\Core_Root -set FRAMEWORK_DIR=%CD%\bin\tests\Windows_NT.%1.%2\GC\Stress\Framework\ReliabilityFramework +set CORE_ROOT=%CD%\artifacts\tests\Windows_NT.%1.%2\Tests\Core_Root +set FRAMEWORK_DIR=%CD%\artifacts\tests\Windows_NT.%1.%2\GC\Stress\Framework\ReliabilityFramework powershell -NoProfile "%CORE_ROOT%\CoreRun.exe %FRAMEWORK_DIR%\ReliabilityFramework.exe %FRAMEWORK_DIR%\testmix_gc.config" if %ERRORLEVEL% == 100 ( @rem The ReliabilityFramework returns 100 on success and 99 on failure diff --git a/src/coreclr/tests/scripts/run-gc-reliability-framework.sh b/src/coreclr/tests/scripts/run-gc-reliability-framework.sh index f83170c51b4bc4..8f8886a1bc84dd 100755 --- a/src/coreclr/tests/scripts/run-gc-reliability-framework.sh +++ b/src/coreclr/tests/scripts/run-gc-reliability-framework.sh @@ -24,8 +24,8 @@ case $OSName in ;; esac -export CORE_ROOT=`pwd`/bin/tests/$OSName.$1.$2/Tests/Core_Root -FRAMEWORK_DIR=`pwd`/bin/tests/$OSName.$1.$2/GC/Stress/Framework/ReliabilityFramework +export CORE_ROOT=`pwd`/artifacts/tests/$OSName.$1.$2/Tests/Core_Root +FRAMEWORK_DIR=`pwd`/artifacts/tests/$OSName.$1.$2/GC/Stress/Framework/ReliabilityFramework $CORE_ROOT/corerun $FRAMEWORK_DIR/ReliabilityFramework.exe $FRAMEWORK_DIR/testmix_gc.config EXIT_CODE=$? if [ $EXIT_CODE -eq 100 ] diff --git a/src/coreclr/tests/scripts/run-pmi-diffs.py b/src/coreclr/tests/scripts/run-pmi-diffs.py index 37de4d8251072c..59fac0d22db1e0 100755 --- a/src/coreclr/tests/scripts/run-pmi-diffs.py +++ b/src/coreclr/tests/scripts/run-pmi-diffs.py @@ -569,7 +569,7 @@ def do_pmi_diffs(): # Generate the diffs # # Invoke command like: - # dotnet c:\gh\jitutils\bin\jit-diff.dll diff --pmi --base --base_root f:\gh\coreclr12 --diff --diff_root f:\gh\coreclr10 --arch x64 --build Checked --tag 1 --noanalyze --output f:\output --corelib + # dotnet c:\gh\jitutils\artifacts\jit-diff.dll diff --pmi --base --base_root f:\gh\coreclr12 --diff --diff_root f:\gh\coreclr10 --arch x64 --build Checked --tag 1 --noanalyze --output f:\output --corelib # # We pass --noanalyze and call jit-analyze manually. This isn't really necessary, but it does give us better output # due to https://github.com/dotnet/jitutils/issues/175. @@ -601,7 +601,7 @@ def do_pmi_diffs(): return 1 # Do the jit-analyze comparison: - # dotnet c:\gh\jitutils\bin\jit-analyze.dll --base f:\output\diffs\1\base --recursive --diff f:\output\diffs\1\diff + # dotnet c:\gh\jitutils\artifacts\jit-analyze.dll --base f:\output\diffs\1\base --recursive --diff f:\output\diffs\1\diff command = ["dotnet", jitAnalyzePath, "--recursive", "--base", baseOutputDir, "--diff", diffOutputDir] returncode = run_command(command, my_env) diff --git a/src/coreclr/tests/scripts/x86_ci_script.sh b/src/coreclr/tests/scripts/x86_ci_script.sh index 99a959616baf21..86af1d161ebedc 100755 --- a/src/coreclr/tests/scripts/x86_ci_script.sh +++ b/src/coreclr/tests/scripts/x86_ci_script.sh @@ -50,9 +50,9 @@ $__dockerCmd $__buildCmd # Begin PAL test __dockerImage="hseok82/dotnet-buildtools-prereqs:ubuntu1604_x86_test" __dockerCmd="docker run -i --rm -v $__currentWorkingDir:/opt/code -w /opt/code $__dockerImage" -__palTestCmd="./src/pal/tests/palsuite/runpaltests.sh /opt/code/bin/obj/Linux.x86.${__buildConfig} /opt/code/bin/paltestout" +__palTestCmd="./src/pal/tests/palsuite/runpaltests.sh /opt/code/artifacts/obj/Linux.x86.${__buildConfig} /opt/code/artifacts/paltestout" $__dockerCmd $__palTestCmd -sudo chown -R $(id -u -n) bin/ +sudo chown -R $(id -u -n) artifacts/ (set +x; echo 'Build complete') diff --git a/src/coreclr/tests/setup-stress-dependencies.cmd b/src/coreclr/tests/setup-stress-dependencies.cmd index 56967ce58d6b71..f7af5ea5f64e3f 100644 --- a/src/coreclr/tests/setup-stress-dependencies.cmd +++ b/src/coreclr/tests/setup-stress-dependencies.cmd @@ -71,7 +71,7 @@ REM ============================================================================ REM Download the package echo Downloading CoreDisTools package -set CoreDisToolsPackagePathOutputFile="%__ThisScriptPath%\..\bin\obj\Windows_NT.%__Arch%\coredistoolspath.txt" +set CoreDisToolsPackagePathOutputFile="%__ThisScriptPath%\..\artifacts\obj\Windows_NT.%__Arch%\coredistoolspath.txt" set DOTNETCMD="%__DotNetCmd%" restore "%__CsprojPath%" echo %DOTNETCMD% call %DOTNETCMD% diff --git a/src/coreclr/tests/setup-stress-dependencies.sh b/src/coreclr/tests/setup-stress-dependencies.sh index 1db0cc97894bb2..530d711ae84128 100755 --- a/src/coreclr/tests/setup-stress-dependencies.sh +++ b/src/coreclr/tests/setup-stress-dependencies.sh @@ -178,7 +178,7 @@ then exit_with_error 1 "Failed to restore the package" fi -CoreDisToolsPackagePathOutputFile="${scriptDir}/../bin/obj/${__BuildOS}.x64/optdatapath.txt" +CoreDisToolsPackagePathOutputFile="${scriptDir}/../artifacts/obj/${__BuildOS}.x64/optdatapath.txt" bash -c -x "$dotnet msbuild $csprojPath /t:DumpCoreDisToolsPackagePath /p:CoreDisToolsPackagePathOutputFile=\"$CoreDisToolsPackagePathOutputFile\" /p:RuntimeIdentifier=\"$rid\" /bl" if [ $? -ne 0 ] diff --git a/src/coreclr/tests/src/Directory.Build.props b/src/coreclr/tests/src/Directory.Build.props index f4b5d399c640ec..8166bcbbd1ba49 100644 --- a/src/coreclr/tests/src/Directory.Build.props +++ b/src/coreclr/tests/src/Directory.Build.props @@ -24,11 +24,11 @@ - $(ProjectDir)..\bin\tests + $(ProjectDir)..\artifacts\tests $(__TestRootDir) $(BaseOutputPath)\$(OSPlatformConfig)\ $(BaseOutputPathWithConfig) - $(ProjectDir)..\bin\tests\obj\$(OSPlatformConfig)\Managed\ + $(ProjectDir)..\artifacts\tests\obj\$(OSPlatformConfig)\Managed\ $(__ManagedTestIntermediatesDir)\ <__NativeTestIntermediatesDir Condition="'$(__NativeTestIntermediatesDir)' == ''">$([System.IO.Path]::GetFullPath($(BaseOutputPathWithConfig)..\obj\$(BuildOS).$(Platform).$(Configuration)\Native\)) $(MSBuildProjectName)\ diff --git a/src/coreclr/tests/src/JIT/CheckProjects/CheckProjects.cs b/src/coreclr/tests/src/JIT/CheckProjects/CheckProjects.cs index ec87ed95999284..df7c7825d17c90 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\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 9fa59438216460..8038b29b90e7f0 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/Product/${UNIXARCHFLAVOR} \ +--mscorlibDir=${WINDOWSCORECLRROOT}/artifacts/Product/${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..cb73e3a58f404e 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\Product\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..8be7edaec244f1 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\Product\$(BuildOS).$(BuildArch).$(BuildType)\netcoreapp2.0\R2RDump.dll $(CoreClrDir).dotnet\dotnet ../../../../../../ - $(BashCoreClrDir)bin/Product/$(BuildOS).$(BuildArch).$(BuildType)/netcoreapp2.0/R2RDump.dll + $(BashCoreClrDir)artifacts/Product/$(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..14e130dbcdf3b6 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\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 )) (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\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 )) (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\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 )) (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\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 )) 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("\",""). - + From dc5d97a225489400ff92f351b68fec127766e4c5 Mon Sep 17 00:00:00 2001 From: jashook Date: Thu, 14 Nov 2019 14:39:15 -0800 Subject: [PATCH 02/27] Fix logs paths --- src/coreclr/build-test.cmd | 2 +- src/coreclr/build-test.sh | 2 +- src/coreclr/build.cmd | 2 +- src/coreclr/build.sh | 2 +- src/coreclr/tests/bringup_runtest.sh | 2 +- src/coreclr/tests/runtest.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/coreclr/build-test.cmd b/src/coreclr/build-test.cmd index 346afaab9f7450..79306bd89facd2 100644 --- a/src/coreclr/build-test.cmd +++ b/src/coreclr/build-test.cmd @@ -40,7 +40,7 @@ set "__TestDir=%__ProjectDir%\tests" set "__ProjectFilesDir=%__TestDir%" set "__SourceDir=%__ProjectDir%\src" set "__RootBinDir=%__ProjectDir%\artifacts" -set "__LogsDir=%__RootBinDir\%logs" +set "__LogsDir=%__RootBinDir\%\logs" set "__MsbuildDebugLogsDir=%__LogsDir%\MsbuildDebugLogs" :: Default __Exclude to issues.targets diff --git a/src/coreclr/build-test.sh b/src/coreclr/build-test.sh index a1064be42bea47..e36db32fe02dfa 100755 --- a/src/coreclr/build-test.sh +++ b/src/coreclr/build-test.sh @@ -702,7 +702,7 @@ CORE_ROOT= source "$__ProjectRoot"/_build-commons.sh # Set dependent variables -__LogsDir="$__RootBinDirlogs" +__LogsDir="$__RootBinDir/logs" __MsbuildDebugLogsDir="$__LogsDir/MsbuildDebugLogs" # Set the remaining variables based upon the determined build configuration diff --git a/src/coreclr/build.cmd b/src/coreclr/build.cmd index 1736013f0b8c2c..52e37ba0029452 100644 --- a/src/coreclr/build.cmd +++ b/src/coreclr/build.cmd @@ -59,7 +59,7 @@ if not exist "%__RepoRootDir%\.dotnet-runtime-placeholder" ( set "__RepoRootDir= set "__ProjectFilesDir=%__ProjectDir%" set "__SourceDir=%__ProjectDir%\src" set "__RootBinDir=%__ProjectDir%\artifacts" -set "__LogsDir=%__RootBinDir%logs" +set "__LogsDir=%__RootBinDir%/logs" set "__MsbuildDebugLogsDir=%__LogsDir%\MsbuildDebugLogs" set __BuildAll= diff --git a/src/coreclr/build.sh b/src/coreclr/build.sh index 378a753aa0633d..a4f1aa45576536 100755 --- a/src/coreclr/build.sh +++ b/src/coreclr/build.sh @@ -643,7 +643,7 @@ if [ "${__BuildArch}" != "${__HostArch}" ]; then fi # Set dependent variables -__LogsDir="$__RootBinDirlogs" +__LogsDir="$__RootBinDir/logs" __MsbuildDebugLogsDir="$__LogsDir/MsbuildDebugLogs" # Set the remaining variables based upon the determined build configuration diff --git a/src/coreclr/tests/bringup_runtest.sh b/src/coreclr/tests/bringup_runtest.sh index a4c7d714e03ebd..b4137edf5ac7f3 100755 --- a/src/coreclr/tests/bringup_runtest.sh +++ b/src/coreclr/tests/bringup_runtest.sh @@ -481,7 +481,7 @@ function create_testhost esac local coreFXTestExecutable=xunit.console.netcore.exe - local coreFXLogDir=${coreClrBinDir}logs/CoreFX/ + local coreFXLogDir=${coreClrBinDir}/logs/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/runtest.sh b/src/coreclr/tests/runtest.sh index d2090c955c3afe..57effe813f96b1 100755 --- a/src/coreclr/tests/runtest.sh +++ b/src/coreclr/tests/runtest.sh @@ -92,7 +92,7 @@ function create_testhost esac local coreFXTestExecutable=xunit.console.netcore.exe - local coreFXLogDir=${coreClrBinDir}logs/CoreFX/ + local coreFXLogDir=${coreClrBinDir}/logs/CoreFX/ local coreFXTestExecutableArgs="--notrait category=nonnetcoreapptests --notrait category=${coreFXTestExclusionDef} --notrait category=failing --notrait category=IgnoreForCI --notrait category=OuterLoop --notrait Benchmark=true" chmod +x ${dotnetExe} From b6b06745bc905d4d9a1f3525fd39290d8ea5466e Mon Sep 17 00:00:00 2001 From: jashook Date: Thu, 14 Nov 2019 14:42:30 -0800 Subject: [PATCH 03/27] Fix paths again --- src/coreclr/build-test.cmd | 2 +- src/coreclr/build.cmd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/coreclr/build-test.cmd b/src/coreclr/build-test.cmd index 79306bd89facd2..fed040018da21e 100644 --- a/src/coreclr/build-test.cmd +++ b/src/coreclr/build-test.cmd @@ -40,7 +40,7 @@ set "__TestDir=%__ProjectDir%\tests" set "__ProjectFilesDir=%__TestDir%" set "__SourceDir=%__ProjectDir%\src" set "__RootBinDir=%__ProjectDir%\artifacts" -set "__LogsDir=%__RootBinDir\%\logs" +set "__LogsDir=%__RootBinDir%\logs" set "__MsbuildDebugLogsDir=%__LogsDir%\MsbuildDebugLogs" :: Default __Exclude to issues.targets diff --git a/src/coreclr/build.cmd b/src/coreclr/build.cmd index 52e37ba0029452..fbd3c2124caef9 100644 --- a/src/coreclr/build.cmd +++ b/src/coreclr/build.cmd @@ -59,7 +59,7 @@ if not exist "%__RepoRootDir%\.dotnet-runtime-placeholder" ( set "__RepoRootDir= set "__ProjectFilesDir=%__ProjectDir%" set "__SourceDir=%__ProjectDir%\src" set "__RootBinDir=%__ProjectDir%\artifacts" -set "__LogsDir=%__RootBinDir%/logs" +set "__LogsDir=%__RootBinDir%\logs" set "__MsbuildDebugLogsDir=%__LogsDir%\MsbuildDebugLogs" set __BuildAll= From 48d4ee259c7c6ccdfb5eb8ed713ef69bb5adf654 Mon Sep 17 00:00:00 2001 From: jashook Date: Thu, 14 Nov 2019 14:46:25 -0800 Subject: [PATCH 04/27] Yml changes --- eng/pipelines/coreclr/templates/build-job.yml | 6 +++--- eng/pipelines/coreclr/templates/build-test-job.yml | 2 +- eng/pipelines/coreclr/templates/perf-job.yml | 4 ++-- eng/pipelines/coreclr/templates/run-test-job.yml | 2 +- eng/pipelines/coreclr/templates/send-to-helix-step.yml | 4 ++-- eng/pipelines/coreclr/templates/xplat-pipeline-job.yml | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/pipelines/coreclr/templates/build-job.yml b/eng/pipelines/coreclr/templates/build-job.yml index f80391da8ed521..bdf7d9f87e0ec3 100644 --- a/eng/pipelines/coreclr/templates/build-job.yml +++ b/eng/pipelines/coreclr/templates/build-job.yml @@ -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/Logs/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\Logs\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: $(coreClrRepoRoot)/artifacts/Logs 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..e15d48d8d0cef9 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: $(coreClrRepoRoot)/artifacts/Logs artifactName: 'TestBuildLogs_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_${{ parameters.testGroup }}' continueOnError: true condition: always() diff --git a/eng/pipelines/coreclr/templates/perf-job.yml b/eng/pipelines/coreclr/templates/perf-job.yml index a6b09981057786..a36d231d568a29 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\${{ 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/${{ 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..1b4314035de349 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: $(coreClrRepoRoot)/artifacts/Logs 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..6cca434421a970 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:${{ parameters.coreClrRepoRoot }}/artifacts/Logs/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:${{ parameters.coreClrRepoRoot }}/artifacts/Logs/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 fd87b7a26d2073..f2516fb1099267 100644 --- a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml +++ b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml @@ -93,7 +93,7 @@ jobs: value: '$(coreClrRepoRoot)$(dir)' - name: binTestsPath - value: '$(coreClrRepoRoot)/bin/tests' + value: '$(coreClrRepoRoot)/artifacts/tests' - name: testRootFolderPath value: '$(binTestsPath)/$(osGroup).$(archType).$(buildConfigUpper)' @@ -105,7 +105,7 @@ jobs: value: 'BinDir_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)' - name: buildProductRootFolderPath - value: '$(coreClrRepoRoot)/bin/Product/$(osGroup).$(archType).$(buildConfigUpper)' + value: '$(coreClrRepoRoot)/artifacts/Product/$(osGroup).$(archType).$(buildConfigUpper)' - name: testArtifactName value: Tests_${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }}_$(archType)_$(buildConfig) From 85f50c552a86c1694fd4cba470fa44a1cef25d2a Mon Sep 17 00:00:00 2001 From: jashook Date: Thu, 14 Nov 2019 15:59:26 -0800 Subject: [PATCH 05/27] Logs -> logs --- eng/pipelines/coreclr/templates/build-job.yml | 6 ++-- .../coreclr/templates/build-test-job.yml | 2 +- .../templates/crossgen-comparison-job.yml | 30 +++++++++---------- .../coreclr/templates/run-test-job.yml | 2 +- .../coreclr/templates/send-to-helix-step.yml | 4 +-- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/eng/pipelines/coreclr/templates/build-job.yml b/eng/pipelines/coreclr/templates/build-job.yml index bdf7d9f87e0ec3..9a4aba98b72764 100644 --- a/eng/pipelines/coreclr/templates/build-job.yml +++ b/eng/pipelines/coreclr/templates/build-job.yml @@ -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)/artifacts/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/logs/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)\artifacts\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\logs\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)/artifacts/Logs + pathtoPublish: $(coreClrRepoRoot)/artifacts/logs 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 e15d48d8d0cef9..e2478417f42783 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)/artifacts/Logs + pathtoPublish: $(coreClrRepoRoot)/artifacts/logs 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..c31bd05970277f 100644 --- a/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml +++ b/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml @@ -40,12 +40,12 @@ jobs: value: $(osGroup).$(hostArchType)_$(archType).$(buildConfigUpper) - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: - name: binDirectory - value: $(coreClrRepoRoot)/bin + value: $(coreClrRepoRoot)/artifacts - name: productDirectory value: $(binDirectory)/Product - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: - name: binDirectory - value: $(coreClrRepoRoot)\bin + value: $(coreClrRepoRoot)\artifacts - name: productDirectory value: $(binDirectory\Product @@ -74,11 +74,11 @@ jobs: - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: - script: | chmod +x $(productDirectory)/$(targetFlavor)/$(hostArchType)/crossgen - mkdir -p $(binDirectory)/Logs/$(crossFlavor) + mkdir -p $(binDirectory)/logs/$(crossFlavor) displayName: Create directories and ensure crossgen is executable - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: - script: | - mkdir $(binDirectory)\Logs\$(crossFlavor) + mkdir $(binDirectory)\logs\$(crossFlavor) displayName: Create directories @@ -99,14 +99,14 @@ jobs: --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) + --result_dir $(binDirectory)/logs/$(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) + --result_dir $(binDirectory)\logs\$(crossFlavor) # Send payload to Helix where the native output is generated and compared to the baseline @@ -126,32 +126,32 @@ jobs: ${{ if ne(parameters.osName, 'Windows_NT') }}: WorkItemCommand: chmod +x $HELIX_WORKITEM_PAYLOAD/Product/$(targetFlavor)/crossgen; - mkdir -p $HELIX_WORKITEM_PAYLOAD/Logs/$(targetFlavor); + mkdir -p $HELIX_WORKITEM_PAYLOAD/logs/$(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/logs/$(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/logs/$(crossFlavor) + --diff_dir $HELIX_WORKITEM_PAYLOAD/logs/$(targetFlavor) ${{ if eq(parameters.osName, 'Windows_NT') }}: WorkItemCommand: - mkdir %HELIX_WORKITEM_PAYLOAD%\Logs\$(targetFlavor); + mkdir %HELIX_WORKITEM_PAYLOAD%\logs\$(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%\logs\$(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%\logs\$(crossFlavor) + --diff_dir %HELIX_WORKITEM_PAYLOAD%\logs\$(targetFlavor) # Publish Logs - task: PublishBuildArtifacts@1 displayName: Publish Logs inputs: - pathtoPublish: $(binDirectory)/Logs + pathtoPublish: $(binDirectory)/logs artifactName: ${{ format('TestLogs_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/run-test-job.yml b/eng/pipelines/coreclr/templates/run-test-job.yml index 1b4314035de349..dff7c3b451492b 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)/artifacts/Logs + pathtoPublish: $(coreClrRepoRoot)/artifacts/logs 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 6cca434421a970..cc1e4c888a1855 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 }}/artifacts/Logs/SendToHelix.binlog + - powershell: eng\common\msbuild.ps1 -ci ${{ parameters.helixProjectArguments }} /maxcpucount /bl:${{ parameters.coreClrRepoRoot }}/artifacts/logs/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 }}/artifacts/Logs/SendToHelix.binlog + - script: $(Build.SourcesDirectory)/eng/common/msbuild.sh --ci ${{ parameters.helixProjectArguments }} /maxcpucount /bl:${{ parameters.coreClrRepoRoot }}/artifacts/logs/SendToHelix.binlog displayName: ${{ parameters.displayName }} ${{ if ne(parameters.condition, '') }}: condition: ${{ parameters.condition }} From 912295a9d3f2bfc10849302fc14543ad9a7beda5 Mon Sep 17 00:00:00 2001 From: jashook Date: Thu, 14 Nov 2019 21:18:58 -0800 Subject: [PATCH 06/27] logs -> log --- src/coreclr/build-packages.cmd | 2 +- src/coreclr/build-packages.sh | 2 +- src/coreclr/build-test.cmd | 2 +- src/coreclr/build-test.sh | 2 +- src/coreclr/build.cmd | 2 +- src/coreclr/build.sh | 2 +- src/coreclr/tests/bringup_runtest.sh | 2 +- src/coreclr/tests/runtest.cmd | 2 +- src/coreclr/tests/runtest.sh | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/coreclr/build-packages.cmd b/src/coreclr/build-packages.cmd index a8cac53f498e10..010ce7be936863 100644 --- a/src/coreclr/build-packages.cmd +++ b/src/coreclr/build-packages.cmd @@ -37,7 +37,7 @@ if [!processedArgs!]==[] ( :ArgsDone -set logFile=%__RepoRootDir%artifacts\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 71aa9ca20d0ad3..40e7614976fff5 100755 --- a/src/coreclr/build-packages.sh +++ b/src/coreclr/build-packages.sh @@ -133,7 +133,7 @@ if [ "${__DistroRid}" = "linux-musl-arm64" ]; then export OutputRID=${__DistroRid} fi -logFile=$__ProjectRoot/artifacts/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 fed040018da21e..7d02bcb5283093 100644 --- a/src/coreclr/build-test.cmd +++ b/src/coreclr/build-test.cmd @@ -40,7 +40,7 @@ set "__TestDir=%__ProjectDir%\tests" set "__ProjectFilesDir=%__TestDir%" set "__SourceDir=%__ProjectDir%\src" set "__RootBinDir=%__ProjectDir%\artifacts" -set "__LogsDir=%__RootBinDir%\logs" +set "__LogsDir=%__RootBinDir%\log" set "__MsbuildDebugLogsDir=%__LogsDir%\MsbuildDebugLogs" :: Default __Exclude to issues.targets diff --git a/src/coreclr/build-test.sh b/src/coreclr/build-test.sh index e36db32fe02dfa..c62deb360eb371 100755 --- a/src/coreclr/build-test.sh +++ b/src/coreclr/build-test.sh @@ -702,7 +702,7 @@ 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 diff --git a/src/coreclr/build.cmd b/src/coreclr/build.cmd index fbd3c2124caef9..aeefdfd553d0f5 100644 --- a/src/coreclr/build.cmd +++ b/src/coreclr/build.cmd @@ -59,7 +59,7 @@ if not exist "%__RepoRootDir%\.dotnet-runtime-placeholder" ( set "__RepoRootDir= set "__ProjectFilesDir=%__ProjectDir%" set "__SourceDir=%__ProjectDir%\src" set "__RootBinDir=%__ProjectDir%\artifacts" -set "__LogsDir=%__RootBinDir%\logs" +set "__LogsDir=%__RootBinDir%\log" set "__MsbuildDebugLogsDir=%__LogsDir%\MsbuildDebugLogs" set __BuildAll= diff --git a/src/coreclr/build.sh b/src/coreclr/build.sh index a4f1aa45576536..9ab6c07dd23655 100755 --- a/src/coreclr/build.sh +++ b/src/coreclr/build.sh @@ -643,7 +643,7 @@ 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 diff --git a/src/coreclr/tests/bringup_runtest.sh b/src/coreclr/tests/bringup_runtest.sh index b4137edf5ac7f3..9ccb94a03416f7 100755 --- a/src/coreclr/tests/bringup_runtest.sh +++ b/src/coreclr/tests/bringup_runtest.sh @@ -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/runtest.cmd b/src/coreclr/tests/runtest.cmd index 3ad22d02fde588..c8fa7d950da1f1 100644 --- a/src/coreclr/tests/runtest.cmd +++ b/src/coreclr/tests/runtest.cmd @@ -17,7 +17,7 @@ set "__ProjectDir=%~dp0" if %__ProjectDir:~-1%==\ set "__ProjectDir=%__ProjectDir:~0,-1%" set "__ProjectFilesDir=%__ProjectDir%" set "__RootBinDir=%__ProjectDir%\..\artifacts" -set "__LogsDir=%__RootBinDir%\logs" +set "__LogsDir=%__RootBinDir%\log" set "__MsbuildDebugLogsDir=%__LogsDir%\MsbuildDebugLogs" set __ToolsDir=%__ProjectDir%\..\Tools set "DotNetCli=%__ProjectDir%\..\dotnet.cmd" diff --git a/src/coreclr/tests/runtest.sh b/src/coreclr/tests/runtest.sh index 57effe813f96b1..fc9bf75272a745 100755 --- a/src/coreclr/tests/runtest.sh +++ b/src/coreclr/tests/runtest.sh @@ -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} From f162a97cb2fa6547a91b373e01761fbda570a778 Mon Sep 17 00:00:00 2001 From: jashook Date: Thu, 14 Nov 2019 21:30:10 -0800 Subject: [PATCH 07/27] More logs->log --- eng/pipelines/coreclr/templates/build-job.yml | 6 ++-- .../coreclr/templates/build-test-job.yml | 2 +- .../templates/crossgen-comparison-job.yml | 32 +++++++++---------- .../coreclr/templates/run-test-job.yml | 2 +- .../coreclr/templates/send-to-helix-step.yml | 4 +-- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/eng/pipelines/coreclr/templates/build-job.yml b/eng/pipelines/coreclr/templates/build-job.yml index 9a4aba98b72764..2a7f601f04a780 100644 --- a/eng/pipelines/coreclr/templates/build-job.yml +++ b/eng/pipelines/coreclr/templates/build-job.yml @@ -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)/artifacts/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)\artifacts\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)/artifacts/logs + pathtoPublish: $(coreClrRepoRoot)/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 e2478417f42783..d68b0cf8fa0d04 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)/artifacts/logs + pathtoPublish: $(coreClrRepoRoot)/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 c31bd05970277f..f9801f15bc4b1f 100644 --- a/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml +++ b/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml @@ -74,11 +74,11 @@ jobs: - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: - script: | chmod +x $(productDirectory)/$(targetFlavor)/$(hostArchType)/crossgen - mkdir -p $(binDirectory)/logs/$(crossFlavor) + mkdir -p $(binDirectory)/log/$(crossFlavor) displayName: Create directories and ensure crossgen is executable - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: - script: | - mkdir $(binDirectory)\logs\$(crossFlavor) + mkdir $(binDirectory)\log\$(crossFlavor) displayName: Create directories @@ -99,14 +99,14 @@ jobs: --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) + --result_dir $(binDirectory)/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) + --result_dir $(binDirectory)\log\$(crossFlavor) # Send payload to Helix where the native output is generated and compared to the baseline @@ -126,32 +126,32 @@ jobs: ${{ if ne(parameters.osName, 'Windows_NT') }}: WorkItemCommand: chmod +x $HELIX_WORKITEM_PAYLOAD/Product/$(targetFlavor)/crossgen; - mkdir -p $HELIX_WORKITEM_PAYLOAD/logs/$(targetFlavor); + 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 --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: $(binDirectory)/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/run-test-job.yml b/eng/pipelines/coreclr/templates/run-test-job.yml index dff7c3b451492b..dcd6d01f910d79 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)/artifacts/logs + pathtoPublish: $(coreClrRepoRoot)/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 cc1e4c888a1855..7746a438c413e2 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 }}/artifacts/logs/SendToHelix.binlog + - powershell: eng\common\msbuild.ps1 -ci ${{ parameters.helixProjectArguments }} /maxcpucount /bl:${{ parameters.coreClrRepoRoot }}/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 }}/artifacts/logs/SendToHelix.binlog + - script: $(Build.SourcesDirectory)/eng/common/msbuild.sh --ci ${{ parameters.helixProjectArguments }} /maxcpucount /bl:${{ parameters.coreClrRepoRoot }}/artifacts/log/SendToHelix.binlog displayName: ${{ parameters.displayName }} ${{ if ne(parameters.condition, '') }}: condition: ${{ parameters.condition }} From 8c082d4fc565715a613ffcdc28ed459a6b0b4d4c Mon Sep 17 00:00:00 2001 From: jashook Date: Fri, 15 Nov 2019 15:09:03 -0800 Subject: [PATCH 08/27] Working product build --- src/coreclr/CMakeLists.txt | 2 +- src/coreclr/build-test.sh | 2 +- src/coreclr/build.sh | 8 ++++---- src/coreclr/dir.common.props | 10 +++++++--- src/coreclr/scripts/superpmi.py | 6 +++--- src/coreclr/src/.nuget/optdata/optdata.csproj | 2 +- src/coreclr/src/dlls/mscordac/CMakeLists.txt | 2 +- src/coreclr/src/vm/.vscode/c_cpp_properties.json | 6 +++--- src/coreclr/tests/Directory.Build.props | 6 +++--- src/coreclr/tests/bringup_runtest.sh | 10 +++++----- src/coreclr/tests/dir.common.props | 4 ++-- src/coreclr/tests/runtest.py | 2 +- src/coreclr/tests/runtest.sh | 6 +++--- 13 files changed, 35 insertions(+), 31 deletions(-) diff --git a/src/coreclr/CMakeLists.txt b/src/coreclr/CMakeLists.txt index 16b3e0c2ffb24d..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("artifacts/obj") +include_directories("../../artifacts/obj/coreclr") if(FEATURE_STANDALONE_GC) add_definitions(-DFEATURE_STANDALONE_GC) diff --git a/src/coreclr/build-test.sh b/src/coreclr/build-test.sh index c62deb360eb371..e6b8b0391dc5bc 100755 --- a/src/coreclr/build-test.sh +++ b/src/coreclr/build-test.sh @@ -681,7 +681,7 @@ __MSBCleanBuildArgs= __NativeTestIntermediatesDir= __PortableBuild=1 __RebuildTests=0 -__RootBinDir="$__ProjectDir/artifacts" +__RootBinDir="$__RepoRootDir/artifacts/bin" __RunTests=0 __SkipConfigure=0 __SkipGenerateLayout=0 diff --git a/src/coreclr/build.sh b/src/coreclr/build.sh index 9ab6c07dd23655..d430a9424e68bb 100755 --- a/src/coreclr/build.sh +++ b/src/coreclr/build.sh @@ -614,7 +614,7 @@ __PgoOptDataPath="" __PgoOptimize=1 __PortableBuild=1 __ProjectDir="$__ProjectRoot" -__RootBinDir="$__ProjectDir/artifacts" +__RootBinDir="$__RepoRootDir/artifacts" __SignTypeArg="" __SkipConfigure=0 __SkipCoreCLR=0 @@ -647,10 +647,10 @@ __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="$__ProjectDir/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 0999ff1cd77a68..f9e2d76598265f 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)artifacts\ + $(__RootBinDir)\bin\ + $(RootRepoDir)artifacts\bin $(__BinDir)\ - $(RootBinDir)Product\$(PlatformConfigPathPart)\ + $(RootBinDir)coreclr\$(PlatformConfigPathPart)\ $(__RootBinDir)\ - $(ProjectDir)..\artifacts\ + $(ProjectDir)..\artifacts\bin\ $(__BinDir)\ - $(RootBinDir)Product\$(BuildOS).$(BuildArch).$(BuildType)\ + $(RootBinDir)coreclr\$(BuildOS).$(BuildArch).$(BuildType)\ - $(RootBinDir)tests\$(BuildOS).$(BuildArch).$(BuildType)\ + $(RootBinDir)tests\coreclr\$(BuildOS).$(BuildArch).$(BuildType)\ $(__AltJitArch) diff --git a/src/coreclr/tests/bringup_runtest.sh b/src/coreclr/tests/bringup_runtest.sh index 9ccb94a03416f7..e4c49c1a50c91f 100755 --- a/src/coreclr/tests/bringup_runtest.sh +++ b/src/coreclr/tests/bringup_runtest.sh @@ -8,20 +8,20 @@ function print_usage { echo '' echo 'coreclr/tests/runtest.sh' echo ' --testRootDir="temp/Windows_NT.x64.Debug"' - echo ' --testNativeBinDir="coreclr/artifacts/obj/Linux.x64.Debug/tests"' - echo ' --coreOverlayDir="coreclr/artifacts/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/artifacts/tests/Windows_NT.x64.Debug).' - echo ' --testNativeBinDir= : Directory of the native CoreCLR test build (e.g. coreclr/artifacts/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/artifacts/Product/Linux.x64.Debug).' + echo ' --coreClrBinDir= : Directory of the CoreCLR build (e.g. runtime/artifacts/Product/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' diff --git a/src/coreclr/tests/dir.common.props b/src/coreclr/tests/dir.common.props index bc95bd97338d97..10c48507a76fe8 100644 --- a/src/coreclr/tests/dir.common.props +++ b/src/coreclr/tests/dir.common.props @@ -17,10 +17,10 @@ - $(CoreclrDir)/artifacts/tests/obj/$(OSPlatformConfig)/Managed/$(BuildProjectRelativeDir) + $(RootRepoDir)/artifacts/tests/corelcr/obj/$(OSPlatformConfig)/Managed/$(BuildProjectRelativeDir) $(BaseIntermediateOutputPath) - $(CoreclrDir)/artifacts/tests/$(OSPlatformConfig)/$(BuildProjectRelativeDir) + $(RootRepoDir)/artifacts/tests/coreclr/$(OSPlatformConfig)/$(BuildProjectRelativeDir) $(BaseOutputPath) diff --git a/src/coreclr/tests/runtest.py b/src/coreclr/tests/runtest.py index 2d7f1c465954e0..d85fd0c8eadc22 100755 --- a/src/coreclr/tests/runtest.py +++ b/src/coreclr/tests/runtest.py @@ -1762,7 +1762,7 @@ def create_repro(host_os, arch, build_type, env, core_root, coreclr_repo_locatio os.makedirs(repro_location) assert os.path.isdir(repro_location) - # Now that the repro_location exists under /artifacts/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 fc9bf75272a745..47ad2b7b970764 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/artifacts/tests/Windows_NT.x64.Debug).' - echo ' --testNativeBinDir= : Directory of the native CoreCLR test build (e.g. coreclr/artifacts/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/artifacts/Product/Linux.x64.Debug).' + echo ' --coreClrBinDir= : Directory of the CoreCLR build (e.g. runtime/artifacts/Product/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).' From b13e0a6d7a2e5e2f1f9eaa27719e63f2fbb141f9 Mon Sep 17 00:00:00 2001 From: jashook Date: Fri, 15 Nov 2019 16:06:20 -0800 Subject: [PATCH 09/27] Working test build --- src/coreclr/build-test.sh | 10 +++++----- src/coreclr/tests/dir.common.props | 2 +- src/coreclr/tests/override.targets | 2 +- src/coreclr/tests/src/Directory.Build.props | 6 +++--- .../tests/src/readytorun/r2rdump/R2RDumpTest.csproj | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/coreclr/build-test.sh b/src/coreclr/build-test.sh index e6b8b0391dc5bc..b11e60eed23da8 100755 --- a/src/coreclr/build-test.sh +++ b/src/coreclr/build-test.sh @@ -681,7 +681,7 @@ __MSBCleanBuildArgs= __NativeTestIntermediatesDir= __PortableBuild=1 __RebuildTests=0 -__RootBinDir="$__RepoRootDir/artifacts/bin" +__RootBinDir="$__RepoRootDir/artifacts" __RunTests=0 __SkipConfigure=0 __SkipGenerateLayout=0 @@ -706,12 +706,12 @@ __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/obj/coreclr/$__BuildOS.$__BuildArch.$__BuildType" __isMSBuildOnNETCoreSupported=0 __CrossComponentBinDir="$__BinDir" __CrossCompIntermediatesDir="$__IntermediatesDir/crossgen" diff --git a/src/coreclr/tests/dir.common.props b/src/coreclr/tests/dir.common.props index 10c48507a76fe8..3139dbcc7374ba 100644 --- a/src/coreclr/tests/dir.common.props +++ b/src/coreclr/tests/dir.common.props @@ -17,7 +17,7 @@ - $(RootRepoDir)/artifacts/tests/corelcr/obj/$(OSPlatformConfig)/Managed/$(BuildProjectRelativeDir) + $(RootRepoDir)/artifacts/tests/obj/coreclr/$(OSPlatformConfig)/Managed/$(BuildProjectRelativeDir) $(BaseIntermediateOutputPath) $(RootRepoDir)/artifacts/tests/coreclr/$(OSPlatformConfig)/$(BuildProjectRelativeDir) diff --git a/src/coreclr/tests/override.targets b/src/coreclr/tests/override.targets index a2a3f7a8c4eeac..0173750d95b4e3 100644 --- a/src/coreclr/tests/override.targets +++ b/src/coreclr/tests/override.targets @@ -14,7 +14,7 @@ > - + diff --git a/src/coreclr/tests/src/Directory.Build.props b/src/coreclr/tests/src/Directory.Build.props index 8166bcbbd1ba49..de76e8503bab27 100644 --- a/src/coreclr/tests/src/Directory.Build.props +++ b/src/coreclr/tests/src/Directory.Build.props @@ -24,13 +24,13 @@ - $(ProjectDir)..\artifacts\tests + $(ProjectDir)..\..\..\artifacts\tests $(__TestRootDir) $(BaseOutputPath)\$(OSPlatformConfig)\ $(BaseOutputPathWithConfig) - $(ProjectDir)..\artifacts\tests\obj\$(OSPlatformConfig)\Managed\ + $(ProjectDir)..\..\..\artifacts\tests\obj\coreclr\$(OSPlatformConfig)\Managed\ $(__ManagedTestIntermediatesDir)\ - <__NativeTestIntermediatesDir Condition="'$(__NativeTestIntermediatesDir)' == ''">$([System.IO.Path]::GetFullPath($(BaseOutputPathWithConfig)..\obj\$(BuildOS).$(Platform).$(Configuration)\Native\)) + <__NativeTestIntermediatesDir Condition="'$(__NativeTestIntermediatesDir)' == ''">$([System.IO.Path]::GetFullPath($(BaseOutputPathWithConfig)..\obj\coreclr\$(BuildOS).$(Platform).$(Configuration)\Native\)) $(MSBuildProjectName)\ $([System.String]::Copy('$(MSBuildProjectDirectory)').Replace($(SourceDir),''))\$(MSBuildProjectName) $(BaseIntermediateOutputPath)$(BuildProjectRelativeDir)\ diff --git a/src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj b/src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj index 8be7edaec244f1..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)artifacts\Product\$(BuildOS).$(BuildArch).$(BuildType)\netcoreapp2.0\R2RDump.dll + $(CoreClrDir)artifacts\bin\coreclr\$(BuildOS).$(BuildArch).$(BuildType)\netcoreapp2.0\R2RDump.dll $(CoreClrDir).dotnet\dotnet ../../../../../../ - $(BashCoreClrDir)artifacts/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)\ From 26ce7c82038023fe9522d578d17b409961807c38 Mon Sep 17 00:00:00 2001 From: jashook Date: Fri, 15 Nov 2019 16:17:47 -0800 Subject: [PATCH 10/27] Small fixes --- src/coreclr/tests/Directory.Build.props | 2 +- src/coreclr/tests/publishdependency.targets | 2 +- src/coreclr/tests/src/Directory.Build.props | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/coreclr/tests/Directory.Build.props b/src/coreclr/tests/Directory.Build.props index 331b02c2649c06..d98488153a75c7 100644 --- a/src/coreclr/tests/Directory.Build.props +++ b/src/coreclr/tests/Directory.Build.props @@ -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) diff --git a/src/coreclr/tests/publishdependency.targets b/src/coreclr/tests/publishdependency.targets index d43d798ca306d0..aeb66596a80dbb 100644 --- a/src/coreclr/tests/publishdependency.targets +++ b/src/coreclr/tests/publishdependency.targets @@ -36,7 +36,7 @@ - $(ProjectDir)\..\artifacts\Product\$(BuildOS).$(BuildArch).$(BuildType) + $(RootRepoDir)\artifacts\bin\$(BuildOS).$(BuildArch).$(BuildType) $(ProductDestination)\ref diff --git a/src/coreclr/tests/src/Directory.Build.props b/src/coreclr/tests/src/Directory.Build.props index de76e8503bab27..ff708a083b1439 100644 --- a/src/coreclr/tests/src/Directory.Build.props +++ b/src/coreclr/tests/src/Directory.Build.props @@ -24,13 +24,13 @@ - $(ProjectDir)..\..\..\artifacts\tests + $(RootRepoDir)\artifacts\tests\coreclr $(__TestRootDir) $(BaseOutputPath)\$(OSPlatformConfig)\ $(BaseOutputPathWithConfig) - $(ProjectDir)..\..\..\artifacts\tests\obj\coreclr\$(OSPlatformConfig)\Managed\ + $(RootRepoDir)\artifacts\tests\obj\coreclr\$(OSPlatformConfig)\Managed\ $(__ManagedTestIntermediatesDir)\ - <__NativeTestIntermediatesDir Condition="'$(__NativeTestIntermediatesDir)' == ''">$([System.IO.Path]::GetFullPath($(BaseOutputPathWithConfig)..\obj\coreclr\$(BuildOS).$(Platform).$(Configuration)\Native\)) + <__NativeTestIntermediatesDir Condition="'$(__NativeTestIntermediatesDir)' == ''">$([System.IO.Path]::GetFullPath($(BaseOutputPathWithConfig)..\..\obj\coreclr\$(BuildOS).$(Platform).$(Configuration)\Native\)) $(MSBuildProjectName)\ $([System.String]::Copy('$(MSBuildProjectDirectory)').Replace($(SourceDir),''))\$(MSBuildProjectName) $(BaseIntermediateOutputPath)$(BuildProjectRelativeDir)\ From a9b681aa8209da4d1135280858199cd9feb9a970 Mon Sep 17 00:00:00 2001 From: jashook Date: Fri, 15 Nov 2019 20:24:30 -0800 Subject: [PATCH 11/27] Fix path for runtest.py --- src/coreclr/scripts/coreclr_arguments.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/scripts/coreclr_arguments.py b/src/coreclr/scripts/coreclr_arguments.py index a1e520cb569e84..65641baf59d537 100644 --- a/src/coreclr/scripts/coreclr_arguments.py +++ b/src/coreclr/scripts/coreclr_arguments.py @@ -205,7 +205,7 @@ def provide_default_host_os(): return None def check_and_return_test_location(test_location): - default_test_location = os.path.join(self.coreclr_repo_location, "artifacts", "tests", "%s.%s.%s" % (self.host_os, self.arch, self.build_type)) + default_test_location = os.path.join(self.coreclr_repo_location, "..", "..", "artifacts", "tests", "coreclr", "%s.%s.%s" % (self.host_os, self.arch, self.build_type)) if os.path.isdir(default_test_location) or not self.require_built_test_dir: return default_test_location From 2b1b5872af11be1399aa3a58dd972edc05284d09 Mon Sep 17 00:00:00 2001 From: jashook Date: Fri, 15 Nov 2019 20:30:48 -0800 Subject: [PATCH 12/27] Windows changes --- src/coreclr/build-test.cmd | 8 ++++---- src/coreclr/build.cmd | 10 +++++----- src/coreclr/tests/tests.targets | 1 - 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/coreclr/build-test.cmd b/src/coreclr/build-test.cmd index 7d02bcb5283093..8e8a533b4985f4 100644 --- a/src/coreclr/build-test.cmd +++ b/src/coreclr/build-test.cmd @@ -39,7 +39,7 @@ if not exist "%__RepoRootDir%\.dotnet-runtime-placeholder" ( set "__RepoRootDir= set "__TestDir=%__ProjectDir%\tests" set "__ProjectFilesDir=%__TestDir%" set "__SourceDir=%__ProjectDir%\src" -set "__RootBinDir=%__ProjectDir%\artifacts" +set "__RootBinDir=%__RepoRootDir%\artifacts" set "__LogsDir=%__RootBinDir%\log" set "__MsbuildDebugLogsDir=%__LogsDir%\MsbuildDebugLogs" @@ -145,8 +145,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 @@ -154,7 +154,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\obj\coreclr\%__BuildOS%.%__BuildArch%.%__BuildType%" ) set "__NativeTestIntermediatesDir=%__RootBinDir%\%__TestIntermediateDir%\Native" set "__ManagedTestIntermediatesDir=%__RootBinDir%\%__TestIntermediateDir%\Managed" diff --git a/src/coreclr/build.cmd b/src/coreclr/build.cmd index aeefdfd553d0f5..e6590787360820 100644 --- a/src/coreclr/build.cmd +++ b/src/coreclr/build.cmd @@ -58,7 +58,7 @@ if not exist "%__RepoRootDir%\.dotnet-runtime-placeholder" ( set "__RepoRootDir= set "__ProjectFilesDir=%__ProjectDir%" set "__SourceDir=%__ProjectDir%\src" -set "__RootBinDir=%__ProjectDir%\artifacts" +set "__RootBinDir=%__RepoRootDir%\artifacts" set "__LogsDir=%__RootBinDir%\log" set "__MsbuildDebugLogsDir=%__LogsDir%\MsbuildDebugLogs" @@ -306,9 +306,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%" @@ -374,7 +374,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/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) - From 7ac21b3f7cf3374c72244ae5206f1859b465d969 Mon Sep 17 00:00:00 2001 From: jashook Date: Fri, 15 Nov 2019 20:42:05 -0800 Subject: [PATCH 13/27] Change yml and more replacements --- eng/pipelines/coreclr/templates/build-job.yml | 2 +- .../coreclr/templates/crossgen-comparison-job.yml | 10 +++++----- eng/pipelines/coreclr/templates/perf-job.yml | 4 ++-- eng/pipelines/coreclr/templates/xplat-pipeline-job.yml | 4 ++-- src/coreclr/tests/bringup_runtest.sh | 2 +- src/coreclr/tests/runtest.cmd | 4 ++-- src/coreclr/tests/runtest.sh | 2 +- src/coreclr/tests/scripts/arm32_ci_script.sh | 4 ++-- src/coreclr/tests/scripts/arm32_ci_test.sh | 6 +++--- src/coreclr/tests/scripts/crossgen_comparison.py | 8 ++++---- src/coreclr/tests/src/JIT/superpmi/runtests.sh | 4 ++-- .../Scenario/JitBench/unofficial_dotnet/README.md | 2 +- .../tests/src/readytorun/r2rdump/rebaseline.cmd | 8 ++++---- 13 files changed, 30 insertions(+), 30 deletions(-) diff --git a/eng/pipelines/coreclr/templates/build-job.yml b/eng/pipelines/coreclr/templates/build-job.yml index 2a7f601f04a780..d369b4f33803ad 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 diff --git a/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml b/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml index f9801f15bc4b1f..5a801531be207e 100644 --- a/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml +++ b/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml @@ -40,12 +40,12 @@ jobs: value: $(osGroup).$(hostArchType)_$(archType).$(buildConfigUpper) - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: - name: binDirectory - value: $(coreClrRepoRoot)/artifacts + value: $(coreClrRepoRoot)/artifacts/bin - name: productDirectory value: $(binDirectory)/Product - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: - name: binDirectory - value: $(coreClrRepoRoot)\artifacts + value: $(coreClrRepoRoot)\artifacts\bin - name: productDirectory value: $(binDirectory\Product @@ -125,11 +125,11 @@ jobs: CorrelationPayloadDirectory: '$(coreClrRepoRoot)/tests/scripts' ${{ if ne(parameters.osName, 'Windows_NT') }}: WorkItemCommand: - chmod +x $HELIX_WORKITEM_PAYLOAD/Product/$(targetFlavor)/crossgen; + 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/log/$(targetFlavor); python -u $HELIX_CORRELATION_PAYLOAD/crossgen_comparison.py compare diff --git a/eng/pipelines/coreclr/templates/perf-job.yml b/eng/pipelines/coreclr/templates/perf-job.yml index a36d231d568a29..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)\artifacts\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)/artifacts/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/xplat-pipeline-job.yml b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml index 1496b009918d76..cc3469908cfcfe 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)/artifacts/tests' + value: '$(coreClrRepoRoot)/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)/artifacts/Product/$(osGroup).$(archType).$(buildConfigUpper)' + value: '$(coreClrRepoRoot)/artifacts/bin/$(osGroup).$(archType).$(buildConfigUpper)' - name: testArtifactName value: Tests_${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }}_$(archType)_$(buildConfig) diff --git a/src/coreclr/tests/bringup_runtest.sh b/src/coreclr/tests/bringup_runtest.sh index e4c49c1a50c91f..efc4cc058e2011 100755 --- a/src/coreclr/tests/bringup_runtest.sh +++ b/src/coreclr/tests/bringup_runtest.sh @@ -21,7 +21,7 @@ function print_usage { 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. runtime/artifacts/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' diff --git a/src/coreclr/tests/runtest.cmd b/src/coreclr/tests/runtest.cmd index c8fa7d950da1f1..e080d34d1f4f87 100644 --- a/src/coreclr/tests/runtest.cmd +++ b/src/coreclr/tests/runtest.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.sh b/src/coreclr/tests/runtest.sh index 47ad2b7b970764..c112c16692bab5 100755 --- a/src/coreclr/tests/runtest.sh +++ b/src/coreclr/tests/runtest.sh @@ -12,7 +12,7 @@ function print_usage { 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. runtime/artifacts/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).' 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..37cb98f43b2281 100755 --- a/src/coreclr/tests/scripts/arm32_ci_test.sh +++ b/src/coreclr/tests/scripts/arm32_ci_test.sh @@ -100,14 +100,14 @@ 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 < Date: Sat, 16 Nov 2019 07:23:29 -0800 Subject: [PATCH 14/27] Fix more yml paths --- .../templates/crossgen-comparison-job.yml | 26 +++++++++++-------- .../coreclr/templates/xplat-pipeline-job.yml | 2 +- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml b/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml index 5a801531be207e..3530849839e976 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: $(coreClrRepoRoot)/artifacts - name: binDirectory - value: $(coreClrRepoRoot)/artifacts/bin + value: $(artifactsDirectory)/bin - name: productDirectory - value: $(binDirectory)/Product + value: $(binDirectory)/coreclr - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - name: artifactsDirectory + value: $(coreClrRepoRoot)\artifacts - name: binDirectory - value: $(coreClrRepoRoot)\artifacts\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)/log/$(crossFlavor) + mkdir -p $(artifactsDirectory)/log/$(crossFlavor) displayName: Create directories and ensure crossgen is executable - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: - script: | - mkdir $(binDirectory)\log\$(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)/log/$(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)\log\$(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 @@ -151,7 +155,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish log inputs: - pathtoPublish: $(binDirectory)/log + 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/xplat-pipeline-job.yml b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml index cc3469908cfcfe..5c97faf0275b19 100644 --- a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml +++ b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml @@ -100,7 +100,7 @@ jobs: value: 'BinDir_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)' - name: buildProductRootFolderPath - value: '$(coreClrRepoRoot)/artifacts/bin/$(osGroup).$(archType).$(buildConfigUpper)' + value: '$(coreClrRepoRoot)/artifacts/bin/coreclr/$(osGroup).$(archType).$(buildConfigUpper)' - name: testArtifactName value: Tests_${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }}_$(archType)_$(buildConfig) From 4b00f578f36b3acdf6814333f805a2e9ce980ef3 Mon Sep 17 00:00:00 2001 From: jashook Date: Sat, 16 Nov 2019 09:28:03 -0800 Subject: [PATCH 15/27] More path fixes --- eng/pipelines/coreclr/templates/xplat-pipeline-job.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml index 5c97faf0275b19..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)/artifacts/tests/coreclr' + 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)/artifacts/bin/coreclr/$(osGroup).$(archType).$(buildConfigUpper)' + value: '$(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).$(archType).$(buildConfigUpper)' - name: testArtifactName value: Tests_${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }}_$(archType)_$(buildConfig) From ec330e973c02bfe8004592c273710b13c28b11d5 Mon Sep 17 00:00:00 2001 From: jashook Date: Sat, 16 Nov 2019 10:31:42 -0800 Subject: [PATCH 16/27] Even more yml changes --- eng/pipelines/coreclr/templates/xplat-pipeline-job.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml index 7c2f4e3efa9fab..c434704bc242c0 100644 --- a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml +++ b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml @@ -88,13 +88,13 @@ jobs: value: '$(coreClrRepoRoot)$(dir)' - name: binTestsPath - value: '$(Build.SourcesDirectory)/artifacts/tests/coreclr' + value: '$(Build.SourcesDirectory)/artifacts/tests/' - name: testRootFolderPath - value: '$(binTestsPath)/$(osGroup).$(archType).$(buildConfigUpper)' + value: '$(binTestsPath)/coreclr/$(osGroup).$(archType).$(buildConfigUpper)' - name: nativeRootFolderPath - value: '$(binTestsPath)/$(osGroup).$(archType).$(buildConfigUpper)' + value: '$(binTestsPath)/coreclr/$(osGroup).$(archType).$(buildConfigUpper)' - name: buildProductArtifactName value: 'BinDir_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)' @@ -109,10 +109,10 @@ jobs: value: 'NativeTestComponents_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)' - name: testNativeRootFolderPath - value: '$(binTestsPath)/obj/$(osGroup).$(archType).$(buildConfigUpper)' + value: '$(binTestsPath)/obj/coreclr/$(osGroup).$(archType).$(buildConfigUpper)' - name: testBuildRootFolderPath - value: '$(binTestsPath)/$(osGroup).$(archType).$(buildConfigUpper)' + value: '$(binTestsPath)/coreclr/$(osGroup).$(archType).$(buildConfigUpper)' - name: testBuildArtifactName value: 'TestBuild_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)' From b9c6190055169c6eed85e307defaf31748acd8d3 Mon Sep 17 00:00:00 2001 From: jashook Date: Sat, 16 Nov 2019 17:31:00 -0800 Subject: [PATCH 17/27] Address feedback --- eng/pipelines/coreclr/templates/xplat-pipeline-job.yml | 10 +++++----- src/coreclr/build-test.cmd | 2 +- src/coreclr/build-test.sh | 2 +- src/coreclr/dir.common.props | 2 +- src/coreclr/tests/Directory.Build.props | 2 +- src/coreclr/tests/dir.common.props | 2 +- src/coreclr/tests/publishdependency.targets | 2 +- src/coreclr/tests/runtest.py | 2 +- src/coreclr/tests/runtest.sh | 2 +- src/coreclr/tests/setup-stress-dependencies.cmd | 2 +- src/coreclr/tests/setup-stress-dependencies.sh | 2 +- src/coreclr/tests/src/Directory.Build.props | 2 +- .../tests/src/JIT/CheckProjects/CheckProjects.cs | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml index c434704bc242c0..7c2f4e3efa9fab 100644 --- a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml +++ b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml @@ -88,13 +88,13 @@ jobs: value: '$(coreClrRepoRoot)$(dir)' - name: binTestsPath - value: '$(Build.SourcesDirectory)/artifacts/tests/' + value: '$(Build.SourcesDirectory)/artifacts/tests/coreclr' - name: testRootFolderPath - value: '$(binTestsPath)/coreclr/$(osGroup).$(archType).$(buildConfigUpper)' + value: '$(binTestsPath)/$(osGroup).$(archType).$(buildConfigUpper)' - name: nativeRootFolderPath - value: '$(binTestsPath)/coreclr/$(osGroup).$(archType).$(buildConfigUpper)' + value: '$(binTestsPath)/$(osGroup).$(archType).$(buildConfigUpper)' - name: buildProductArtifactName value: 'BinDir_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)' @@ -109,10 +109,10 @@ jobs: value: 'NativeTestComponents_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)' - name: testNativeRootFolderPath - value: '$(binTestsPath)/obj/coreclr/$(osGroup).$(archType).$(buildConfigUpper)' + value: '$(binTestsPath)/obj/$(osGroup).$(archType).$(buildConfigUpper)' - name: testBuildRootFolderPath - value: '$(binTestsPath)/coreclr/$(osGroup).$(archType).$(buildConfigUpper)' + value: '$(binTestsPath)/$(osGroup).$(archType).$(buildConfigUpper)' - name: testBuildArtifactName value: 'TestBuild_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)' diff --git a/src/coreclr/build-test.cmd b/src/coreclr/build-test.cmd index 7cfe0b14c69ba2..f126181d88b681 100644 --- a/src/coreclr/build-test.cmd +++ b/src/coreclr/build-test.cmd @@ -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\coreclr\%__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 019e998f66a371..3f0fc0634b5150 100755 --- a/src/coreclr/build-test.sh +++ b/src/coreclr/build-test.sh @@ -705,7 +705,7 @@ __PackagesBinDir="$__BinDir/.nuget" __TestDir="$__ProjectDir/tests" __TestWorkingDir="$__RootBinDir/tests/coreclr/$__BuildOS.$__BuildArch.$__BuildType" __IntermediatesDir="$__RootBinDir/obj/coreclr/$__BuildOS.$__BuildArch.$__BuildType" -__TestIntermediatesDir="$__RootBinDir/tests/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/dir.common.props b/src/coreclr/dir.common.props index f9e2d76598265f..c27381cbc998a3 100644 --- a/src/coreclr/dir.common.props +++ b/src/coreclr/dir.common.props @@ -49,7 +49,7 @@ $(ProjectDir)src\ $(__RootBinDir)\bin\ - $(RootRepoDir)artifacts\bin + $(RootRepoDir)artifacts\bin\ $(__BinDir)\ $(RootBinDir)coreclr\$(PlatformConfigPathPart)\ diff --git a/src/coreclr/tests/Directory.Build.props b/src/coreclr/tests/Directory.Build.props index d98488153a75c7..74f8b7b78bc72b 100644 --- a/src/coreclr/tests/Directory.Build.props +++ b/src/coreclr/tests/Directory.Build.props @@ -21,7 +21,7 @@ $(__RootBinDir)\ - $(ProjectDir)..\artifacts\bin\ + $(ProjectDir)..\..\..\artifacts\bin\ $(__BinDir)\ $(RootBinDir)coreclr\$(BuildOS).$(BuildArch).$(BuildType)\ diff --git a/src/coreclr/tests/dir.common.props b/src/coreclr/tests/dir.common.props index 3139dbcc7374ba..a5495473c6c2ed 100644 --- a/src/coreclr/tests/dir.common.props +++ b/src/coreclr/tests/dir.common.props @@ -17,7 +17,7 @@ - $(RootRepoDir)/artifacts/tests/obj/coreclr/$(OSPlatformConfig)/Managed/$(BuildProjectRelativeDir) + $(RootRepoDir)/artifacts/tests/coreclr/obj/$(OSPlatformConfig)/Managed/$(BuildProjectRelativeDir) $(BaseIntermediateOutputPath) $(RootRepoDir)/artifacts/tests/coreclr/$(OSPlatformConfig)/$(BuildProjectRelativeDir) diff --git a/src/coreclr/tests/publishdependency.targets b/src/coreclr/tests/publishdependency.targets index aeb66596a80dbb..b32770001c5206 100644 --- a/src/coreclr/tests/publishdependency.targets +++ b/src/coreclr/tests/publishdependency.targets @@ -36,7 +36,7 @@ - $(RootRepoDir)\artifacts\bin\$(BuildOS).$(BuildArch).$(BuildType) + $(RootRepoDir)\artifacts\bin\coreclr\$(BuildOS).$(BuildArch).$(BuildType) $(ProductDestination)\ref diff --git a/src/coreclr/tests/runtest.py b/src/coreclr/tests/runtest.py index fe1620a4faca71..78c291a934736a 100755 --- a/src/coreclr/tests/runtest.py +++ b/src/coreclr/tests/runtest.py @@ -1028,7 +1028,7 @@ def run_tests(host_os, # 3) git submodule update --init # 4) powershell .\build.ps1 -target packages -buildAssemblyVersion 2.4.1 -buildSemanticVersion 2.4.1-coreclr # - # Then file "xunit\src\xunit.console\artifacts\Release\netcoreapp2.0\xunit.console.dll" was archived and uploaded to the clrjit blob storage. + # Then file "xunit\src\xunit.console\bin\Release\netcoreapp2.0\xunit.console.dll" was archived and uploaded to the clrjit blob storage. # # Ideally, this code should be removed when we find a more robust way of running Xunit tests. # diff --git a/src/coreclr/tests/runtest.sh b/src/coreclr/tests/runtest.sh index c112c16692bab5..bf6c405910f76f 100755 --- a/src/coreclr/tests/runtest.sh +++ b/src/coreclr/tests/runtest.sh @@ -63,7 +63,7 @@ function create_testhost local coreClrSrcTestDir=$coreClrSrc/tests if [ -z $coreClrBinDir ]; then - local coreClrBinDir=${coreClrSrc}/bin + local coreClrBinDir=${coreClrSrc}/../../artifacts/bin/coreclr export __CoreFXTestDir=${coreClrSrc}/artifacts/tests/CoreFX else export __CoreFXTestDir=${coreClrBinDir}/tests/CoreFX diff --git a/src/coreclr/tests/setup-stress-dependencies.cmd b/src/coreclr/tests/setup-stress-dependencies.cmd index f7af5ea5f64e3f..09a6119a4a61d0 100644 --- a/src/coreclr/tests/setup-stress-dependencies.cmd +++ b/src/coreclr/tests/setup-stress-dependencies.cmd @@ -71,7 +71,7 @@ REM ============================================================================ REM Download the package echo Downloading CoreDisTools package -set CoreDisToolsPackagePathOutputFile="%__ThisScriptPath%\..\artifacts\obj\Windows_NT.%__Arch%\coredistoolspath.txt" +set CoreDisToolsPackagePathOutputFile="%__ThisScriptPath%\..\..\..\artifacts\obj\coreclr\Windows_NT.%__Arch%\coredistoolspath.txt" set DOTNETCMD="%__DotNetCmd%" restore "%__CsprojPath%" echo %DOTNETCMD% call %DOTNETCMD% diff --git a/src/coreclr/tests/setup-stress-dependencies.sh b/src/coreclr/tests/setup-stress-dependencies.sh index 530d711ae84128..00eb9a3d764182 100755 --- a/src/coreclr/tests/setup-stress-dependencies.sh +++ b/src/coreclr/tests/setup-stress-dependencies.sh @@ -178,7 +178,7 @@ then exit_with_error 1 "Failed to restore the package" fi -CoreDisToolsPackagePathOutputFile="${scriptDir}/../artifacts/obj/${__BuildOS}.x64/optdatapath.txt" +CoreDisToolsPackagePathOutputFile="${scriptDir}/../../../artifacts/obj/coreclr/${__BuildOS}.x64/optdatapath.txt" bash -c -x "$dotnet msbuild $csprojPath /t:DumpCoreDisToolsPackagePath /p:CoreDisToolsPackagePathOutputFile=\"$CoreDisToolsPackagePathOutputFile\" /p:RuntimeIdentifier=\"$rid\" /bl" if [ $? -ne 0 ] diff --git a/src/coreclr/tests/src/Directory.Build.props b/src/coreclr/tests/src/Directory.Build.props index ff708a083b1439..a6f3e22e68421e 100644 --- a/src/coreclr/tests/src/Directory.Build.props +++ b/src/coreclr/tests/src/Directory.Build.props @@ -28,7 +28,7 @@ $(__TestRootDir) $(BaseOutputPath)\$(OSPlatformConfig)\ $(BaseOutputPathWithConfig) - $(RootRepoDir)\artifacts\tests\obj\coreclr\$(OSPlatformConfig)\Managed\ + $(RootRepoDir)\artifacts\tests\coreclr\obj\$(OSPlatformConfig)\Managed\ $(__ManagedTestIntermediatesDir)\ <__NativeTestIntermediatesDir Condition="'$(__NativeTestIntermediatesDir)' == ''">$([System.IO.Path]::GetFullPath($(BaseOutputPathWithConfig)..\..\obj\coreclr\$(BuildOS).$(Platform).$(Configuration)\Native\)) $(MSBuildProjectName)\ diff --git a/src/coreclr/tests/src/JIT/CheckProjects/CheckProjects.cs b/src/coreclr/tests/src/JIT/CheckProjects/CheckProjects.cs index df7c7825d17c90..5e72f865e29d60 100644 --- a/src/coreclr/tests/src/JIT/CheckProjects/CheckProjects.cs +++ b/src/coreclr/tests/src/JIT/CheckProjects/CheckProjects.cs @@ -34,7 +34,7 @@ private static int Main(string[] args) s_tryAndFix = false; // CORE_ROOT should be something like - // c:\repos\coreclr\artifacts\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\artifacts\tests\Windows_NT.x64.Release\Tests\Core_Root // We want From 5dd072bdb83b61f20e85405707fcb15b5696be5b Mon Sep 17 00:00:00 2001 From: jashook Date: Sat, 16 Nov 2019 17:49:20 -0800 Subject: [PATCH 18/27] Fix native test path --- src/coreclr/tests/src/Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/tests/src/Directory.Build.props b/src/coreclr/tests/src/Directory.Build.props index a6f3e22e68421e..5aab210149d5f1 100644 --- a/src/coreclr/tests/src/Directory.Build.props +++ b/src/coreclr/tests/src/Directory.Build.props @@ -30,7 +30,7 @@ $(BaseOutputPathWithConfig) $(RootRepoDir)\artifacts\tests\coreclr\obj\$(OSPlatformConfig)\Managed\ $(__ManagedTestIntermediatesDir)\ - <__NativeTestIntermediatesDir Condition="'$(__NativeTestIntermediatesDir)' == ''">$([System.IO.Path]::GetFullPath($(BaseOutputPathWithConfig)..\..\obj\coreclr\$(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)\ From 2a01d0a19739c0855999430530eeb86849734bd0 Mon Sep 17 00:00:00 2001 From: jashook Date: Sat, 16 Nov 2019 19:30:21 -0800 Subject: [PATCH 19/27] Mop up ci change --- eng/pipelines/coreclr/templates/build-job.yml | 2 +- eng/pipelines/coreclr/templates/build-test-job.yml | 2 +- eng/pipelines/coreclr/templates/crossgen-comparison-job.yml | 6 +++--- src/coreclr/tests/Directory.Build.props | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/pipelines/coreclr/templates/build-job.yml b/eng/pipelines/coreclr/templates/build-job.yml index d369b4f33803ad..1ac2eb09beeb50 100644 --- a/eng/pipelines/coreclr/templates/build-job.yml +++ b/eng/pipelines/coreclr/templates/build-job.yml @@ -227,7 +227,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish Logs inputs: - pathtoPublish: $(coreClrRepoRoot)/artifacts/log + 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 d68b0cf8fa0d04..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)/artifacts/log + 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 3530849839e976..1faa94d9a7043c 100644 --- a/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml +++ b/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml @@ -40,18 +40,18 @@ jobs: value: $(osGroup).$(hostArchType)_$(archType).$(buildConfigUpper) - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: - name: artifactsDirectory - value: $(coreClrRepoRoot)/artifacts + value: $(Build.SourcesDirectory)/artifacts - name: binDirectory value: $(artifactsDirectory)/bin - name: productDirectory value: $(binDirectory)/coreclr - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: - name: artifactsDirectory - value: $(coreClrRepoRoot)\artifacts + value: $(Build.SourcesDirectory)\artifacts - name: binDirectory value: $(artifactsDirectory)\bin - name: productDirectory - value: $(binDirectory\coreclr + 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) }} diff --git a/src/coreclr/tests/Directory.Build.props b/src/coreclr/tests/Directory.Build.props index 74f8b7b78bc72b..aaa612c0fae31a 100644 --- a/src/coreclr/tests/Directory.Build.props +++ b/src/coreclr/tests/Directory.Build.props @@ -21,10 +21,10 @@ $(__RootBinDir)\ - $(ProjectDir)..\..\..\artifacts\bin\ + $(ProjectDir)..\..\..\artifacts\ $(__BinDir)\ - $(RootBinDir)coreclr\$(BuildOS).$(BuildArch).$(BuildType)\ + $(RootBinDir)bin\coreclr\$(BuildOS).$(BuildArch).$(BuildType)\ $(RootBinDir)tests\coreclr\$(BuildOS).$(BuildArch).$(BuildType)\ From 39140b1629a9f363369edc421644c9075f7712d6 Mon Sep 17 00:00:00 2001 From: jashook Date: Sat, 16 Nov 2019 21:01:54 -0800 Subject: [PATCH 20/27] Change helix submit to use correct testhost location --- eng/helixcorefxtests.proj | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/eng/helixcorefxtests.proj b/eng/helixcorefxtests.proj index 75858aeff10603..555604a4fa8101 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\corelcr\tests\CoreFX\CoreFX.issues.rsp $(TestWorkingDir)testhost\ $(TestWorkingDir)helix\ diff --git a/eng/pipelines/coreclr/templates/run-test-job.yml b/eng/pipelines/coreclr/templates/run-test-job.yml index dcd6d01f910d79..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)/artifacts/log + 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 7746a438c413e2..d3d3f69fe11053 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 }}/artifacts/log/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 }}/artifacts/log/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 }} From 7f546b837f1bd6967dc4f6a4c0c524ef29163457 Mon Sep 17 00:00:00 2001 From: jashook Date: Sun, 17 Nov 2019 07:17:58 -0800 Subject: [PATCH 24/27] Fix yml syntax --- eng/pipelines/coreclr/templates/send-to-helix-step.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/coreclr/templates/send-to-helix-step.yml b/eng/pipelines/coreclr/templates/send-to-helix-step.yml index d3d3f69fe11053..e89e2744a3feee 100644 --- a/eng/pipelines/coreclr/templates/send-to-helix-step.yml +++ b/eng/pipelines/coreclr/templates/send-to-helix-step.yml @@ -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:${{ Build.SourcesDirectory }}/artifacts/log/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 }} From c61c164bbd3e6fae3d8fba177c849b9203926a46 Mon Sep 17 00:00:00 2001 From: jashook Date: Sun, 17 Nov 2019 07:20:50 -0800 Subject: [PATCH 25/27] more syntax changes --- eng/pipelines/coreclr/templates/send-to-helix-step.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/coreclr/templates/send-to-helix-step.yml b/eng/pipelines/coreclr/templates/send-to-helix-step.yml index e89e2744a3feee..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:${{ Build.SourcesDirectory }}/artifacts/log/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 }} From 84ca4a30f6d91747edab865f7cb6eadb9acac6e0 Mon Sep 17 00:00:00 2001 From: jashook Date: Sun, 17 Nov 2019 10:08:07 -0800 Subject: [PATCH 26/27] Fix extremely stupid typo. --- eng/helixcorefxtests.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/helixcorefxtests.proj b/eng/helixcorefxtests.proj index 17eca291b6dbe7..8f69c0bf587c45 100644 --- a/eng/helixcorefxtests.proj +++ b/eng/helixcorefxtests.proj @@ -96,7 +96,7 @@ any particular job. However, this mechanism is super simple; we don't need to manage fine- grained exclusions; and there really shouldn't be any (or many) exclusions anyway. --> - $(ProjectDir)src\corelcr\tests\CoreFX\CoreFX.issues.rsp + $(ProjectDir)src\coreclr\tests\CoreFX\CoreFX.issues.rsp $(TestWorkingDir)testhost\ $(TestWorkingDir)helix\ From 278fec7508a941b4d01f9e8471a9ca27fc7ec02d Mon Sep 17 00:00:00 2001 From: jashook Date: Sun, 17 Nov 2019 12:19:46 -0800 Subject: [PATCH 27/27] Hopefully last path to fix --- eng/helixcorefxtests.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/helixcorefxtests.proj b/eng/helixcorefxtests.proj index 8f69c0bf587c45..7b14fb1d0ca70a 100644 --- a/eng/helixcorefxtests.proj +++ b/eng/helixcorefxtests.proj @@ -149,7 +149,7 @@ - <_ProjectsToBuild Include="$(ProjectDir)tests\testenvironment.proj"> + <_ProjectsToBuild Include="$(ProjectDir)src\coreclr\tests\testenvironment.proj"> Scenario=$(Scenario);TestEnvFileName=$(TestEnvFilePath);TargetsWindows=$(TargetsWindows)