diff options
| author | jiseob.jang <jiseob.jang@samsung.com> | 2017-09-06 20:40:24 +0900 |
|---|---|---|
| committer | jiseob.jang <jiseob.jang@samsung.com> | 2017-09-07 11:55:42 +0900 |
| commit | cb9516da9df966079e5a34490139eec68c38dafa (patch) | |
| tree | 39d5565943e78c35dd013cc771ed2980788fff38 /tests/scripts | |
| parent | 61d6a817e39d3bae0f47dbc09838d51db22a5d30 (diff) | |
| download | coreclr-cb9516da9df966079e5a34490139eec68c38dafa.tar.gz coreclr-cb9516da9df966079e5a34490139eec68c38dafa.tar.bz2 coreclr-cb9516da9df966079e5a34490139eec68c38dafa.zip | |
Imported Upstream version 2.0.0.12082upstream/2.0.0.12082
Diffstat (limited to 'tests/scripts')
| -rwxr-xr-x | tests/scripts/arm32_ci_script.sh | 7 | ||||
| -rwxr-xr-x | tests/scripts/perf-prep.sh | 22 |
2 files changed, 16 insertions, 13 deletions
diff --git a/tests/scripts/arm32_ci_script.sh b/tests/scripts/arm32_ci_script.sh index 98f35066d4..e73e266fdb 100755 --- a/tests/scripts/arm32_ci_script.sh +++ b/tests/scripts/arm32_ci_script.sh @@ -289,9 +289,14 @@ function cross_build_coreclr_with_docker { sudo chown -R $(id -u -n) cross/rootfs fi + __extraArgs="" + if [[ "$__buildArch" == "armel" && "$__linuxCodeName" == "tizen" ]]; then + __extraArgs="cmakeargs -DFEATURE_GDBJIT=TRUE -PortableBuild=false" + fi + # Cross building coreclr with rootfs in Docker (set +x; echo "Start cross build coreclr for $__buildArch $__linuxCodeName") - __buildCmd="./build.sh $__buildArch cross $__verboseFlag $__skipMscorlib $__buildConfig -rebuild" + __buildCmd="./build.sh $__buildArch cross $__verboseFlag $__skipMscorlib $__buildConfig $__extraArgs -rebuild" $__dockerCmd $__buildCmd sudo chown -R $(id -u -n) ./bin } diff --git a/tests/scripts/perf-prep.sh b/tests/scripts/perf-prep.sh index 4468dbb6f7..6882d8f6a3 100755 --- a/tests/scripts/perf-prep.sh +++ b/tests/scripts/perf-prep.sh @@ -64,27 +64,25 @@ python3.5 --version python3.5 ./tests/scripts/Microsoft.BenchView.JSONFormat/tools/machinedata.py if [ $throughput -eq 1 ]; then - # Clone corefx - if [ -d "_" ]; then - rm -r -f _ + # Download throughput benchmarks + if [ -d "Microsoft.Benchview.ThroughputBenchmarks.x64.Windows_NT" ]; then + rm -r -f Microsoft.Benchview.ThroughputBenchmarks.x64.Windows_NT fi - mkdir _ - git clone https://github.com/dotnet/corefx.git _/fx - cd _/fx + mkdir Microsoft.Benchview.ThroughputBenchmarks.x64.Windows_NT + cd Microsoft.Benchview.ThroughputBenchmarks.x64.Windows_NT - # Checkout the specific commit we want - git checkout f0b9e238c08f62a1db90ef0378980ac771204d35 + curl -OL https://dotnet.myget.org/F/dotnet-core/api/v2/package/Microsoft.Benchview.ThroughputBenchmarks.x64.Windows_NT/1.0.0 + mv 1.0.0 1.0.0.zip + unzip -q 1.0.0.zip - # Build - ./build.sh -release else # Set up the copies # Coreclr build containing the tests and mscorlib - curl https://ci.dot.net/job/$perfBranch/job/master/job/release_windows_nt/lastSuccessfulBuild/artifact/bin/tests/tests.zip -o tests.zip + curl https://ci.dot.net/job/$perfBranch/job/release_2.0.0/job/release_windows_nt/lastSuccessfulBuild/artifact/bin/tests/tests.zip -o tests.zip # Corefx components. We now have full stack builds on all distros we test here, so we can copy straight from CoreFX jobs. mkdir corefx - curl https://ci.dot.net/job/dotnet_corefx/job/master/job/ubuntu14.04_release/lastSuccessfulBuild/artifact/bin/build.tar.gz -o ./corefx/build.tar.gz + curl https://ci.dot.net/job/dotnet_corefx/job/release_2.0.0/job/ubuntu14.04_release/lastSuccessfulBuild/artifact/bin/build.tar.gz -o ./corefx/build.tar.gz # Unpack the corefx binaries pushd corefx > /dev/null |