diff options
| author | Smile Wei <xiwe@microsoft.com> | 2016-09-08 12:25:54 -0700 |
|---|---|---|
| committer | Smile Wei <xiwe@microsoft.com> | 2016-09-13 14:11:09 -0700 |
| commit | 626c27756429923fa96ca49e05ca2a1862acef37 (patch) | |
| tree | 40830ba4682793e1d066a035f32c62757b5d636a /tests/scripts | |
| parent | 5cd7154f1f7cf5cdbf918c5923ffc70a1ecf4bb3 (diff) | |
| download | coreclr-626c27756429923fa96ca49e05ca2a1862acef37.tar.gz coreclr-626c27756429923fa96ca49e05ca2a1862acef37.tar.bz2 coreclr-626c27756429923fa96ca49e05ca2a1862acef37.zip | |
List all generated perf .xml files.
Diffstat (limited to 'tests/scripts')
| -rw-r--r-- | tests/scripts/perf-prep.sh | 12 | ||||
| -rw-r--r-- | tests/scripts/run-xunit-perf.sh | 17 |
2 files changed, 17 insertions, 12 deletions
diff --git a/tests/scripts/perf-prep.sh b/tests/scripts/perf-prep.sh index 3c232b0c2e..800b5cb6f4 100644 --- a/tests/scripts/perf-prep.sh +++ b/tests/scripts/perf-prep.sh @@ -44,6 +44,18 @@ echo "branch = $perfBranch" echo "architecture = $perfArch" echo "configuration = $perfConfig" +# Install nuget to download benchview package, which includes the script machinedata.py for machine data collection +wget https://dist.nuget.org/win-x86-commandline/latest/nuget.exe +chmod u+x ./nuget.exe +./nuget.exe install Microsoft.BenchView.JSONFormat -Source http://benchviewtestfeed.azurewebsites.net/nuget -OutputDirectory ./tests/scripts -Prerelease + +# Install python 3.5.2 to run machinedata.py for machine data collection +sudo add-apt-repository ppa:fkrull/deadsnakes +sudo apt-get update +sudo apt-get --assume-yes install python3.5 +python3.5 --version +python3.5 ./tests/scripts/Microsoft.BenchView.JSONFormat.0.1.0-pre010/tools/machinedata.py + # Set up the copies # Coreclr build containing the tests and mscorlib curl http://dotnet-ci.cloudapp.net/job/$perfBranch/job/master/job/release_windows_nt/lastSuccessfulBuild/artifact/bin/tests/tests.zip -o tests.zip diff --git a/tests/scripts/run-xunit-perf.sh b/tests/scripts/run-xunit-perf.sh index e56194ce8b..39202ecbc7 100644 --- a/tests/scripts/run-xunit-perf.sh +++ b/tests/scripts/run-xunit-perf.sh @@ -386,18 +386,9 @@ echo "CORE_ROOT dir = $CORE_ROOT" DO_SETUP=TRUE -dir $testNativeBinDir/../../../../.. -echo 'dir $testNativeBinDir/../../../../..' -dir $testNativeBinDir/../../../../../packages -echo 'dir $testNativeBinDir/../../../../../packages' -dir $testNativeBinDir/../../../../../packages/Microsoft.DotNet.xunit.performance.runner.cli -echo 'dir $testNativeBinDir/../../../../../packages/Microsoft.DotNet.xunit.performance.runner.cli' -dir $testNativeBinDir/../../../../../packages/Microsoft.DotNet.xunit.performance.runner.cli/1.0.0-alpha-build0035 -echo 'dir $testNativeBinDir/../../../../../packages/Microsoft.DotNet.xunit.performance.runner.cli/1.0.0-alpha-build0035' - if [ ${DO_SETUP} == "TRUE" ]; then -cp $testNativeBinDir/../../../../../packages/Microsoft.DotNet.xunit.performance.runner.cli/1.0.0-alpha-build0035/lib/netstandard1.3/Microsoft.DotNet.xunit.performance.runner.cli.dll . -cp $testNativeBinDir/../../../../../packages/Microsoft.DotNet.xunit.performance.run.core/1.0.0-alpha-build0035/lib/dotnet/*.dll . +cp $testNativeBinDir/../../../../../packages/Microsoft.DotNet.xunit.performance.runner.cli/1.0.0-alpha-build0040/lib/netstandard1.3/Microsoft.DotNet.xunit.performance.runner.cli.dll . +cp $testNativeBinDir/../../../../../packages/Microsoft.DotNet.xunit.performance.run.core/1.0.0-alpha-build0040/lib/dotnet/*.dll . fi # Run coreclr performance tests @@ -414,5 +405,7 @@ cp $testcase . chmod u+x ./corerun ./corerun Microsoft.DotNet.xunit.performance.runner.cli.dll $test -runner xunit.console.netcore.exe -runnerhost ./corerun -verbose -runid perf-$testname - done + +mkdir ../../../../../sandbox +cp *.xml ../../../../../sandbox |