diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2018-02-23 03:04:26 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-23 03:04:26 +0300 |
| commit | 7d27b46388b2a3fb3b4f46c487aef352520a11cc (patch) | |
| tree | 5e1c321a9196cbe988e09e12c50865061d81f23b /tests | |
| parent | 113e1237e89601463889239edf2cf4e35c0e38e9 (diff) | |
Update buildtools (#5426)
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/runtest.sh | 4 | ||||
| -rwxr-xr-x | tests/testenv.sh | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/tests/runtest.sh b/tests/runtest.sh index 36d087023..51104cf81 100755 --- a/tests/runtest.sh +++ b/tests/runtest.sh @@ -58,8 +58,8 @@ run_test_dir() local __msbuild_dir=${CoreRT_TestRoot}/../Tools - echo ${__msbuild_dir}/dotnetcli/dotnet ${__msbuild_dir}/MSBuild.dll /ds /m /p:IlcPath=${CoreRT_ToolchainDir} /p:Configuration=${CoreRT_BuildType} /p:Platform=${CoreRT_BuildArch} /p:RepoLocalBuild=true "/p:FrameworkLibPath=${CoreRT_TestRoot}/../bin/${CoreRT_BuildOS}.${CoreRT_BuildArch}.${CoreRT_BuildType}/lib" "/p:FrameworkObjPath=${CoreRT_TestRoot}/../bin/obj/${CoreRT_BuildOS}.${CoreRT_BuildArch}.${CoreRT_BuildType}/Framework" ${__extra_args} "${__extra_cxxflags}" "${__extra_linkflags}" ${__dir_path}/${__filename}.csproj - ${__msbuild_dir}/dotnetcli/dotnet ${__msbuild_dir}/MSBuild.dll /ds /m /p:IlcPath=${CoreRT_ToolchainDir} /p:Configuration=${CoreRT_BuildType} /p:Platform=${CoreRT_BuildArch} /p:OSGroup=${CoreRT_BuildOS} /p:RepoLocalBuild=true "/p:FrameworkLibPath=${CoreRT_TestRoot}/../bin/${CoreRT_BuildOS}.${CoreRT_BuildArch}.${CoreRT_BuildType}/lib" "/p:FrameworkObjPath=${CoreRT_TestRoot}/../bin/obj/${CoreRT_BuildOS}.${CoreRT_BuildArch}.${CoreRT_BuildType}/Framework" ${__extra_args} "${__extra_cxxflags}" "${__extra_linkflags}" ${__dir_path}/${__filename}.csproj + echo ${__msbuild_dir}/msbuild.sh /ds /m /p:IlcPath=${CoreRT_ToolchainDir} /p:Configuration=${CoreRT_BuildType} /p:Platform=${CoreRT_BuildArch} /p:RepoLocalBuild=true "/p:FrameworkLibPath=${CoreRT_TestRoot}/../bin/${CoreRT_BuildOS}.${CoreRT_BuildArch}.${CoreRT_BuildType}/lib" "/p:FrameworkObjPath=${CoreRT_TestRoot}/../bin/obj/${CoreRT_BuildOS}.${CoreRT_BuildArch}.${CoreRT_BuildType}/Framework" ${__extra_args} ${__extra_cxxflags} ${__extra_linkflags} ${__dir_path}/${__filename}.csproj + ${__msbuild_dir}/msbuild.sh /ds /m /p:IlcPath=${CoreRT_ToolchainDir} /p:Configuration=${CoreRT_BuildType} /p:Platform=${CoreRT_BuildArch} /p:OSGroup=${CoreRT_BuildOS} /p:RepoLocalBuild=true "/p:FrameworkLibPath=${CoreRT_TestRoot}/../bin/${CoreRT_BuildOS}.${CoreRT_BuildArch}.${CoreRT_BuildType}/lib" "/p:FrameworkObjPath=${CoreRT_TestRoot}/../bin/obj/${CoreRT_BuildOS}.${CoreRT_BuildArch}.${CoreRT_BuildType}/Framework" ${__extra_args} ${__extra_cxxflags} ${__extra_linkflags} ${__dir_path}/${__filename}.csproj local __exitcode=$? diff --git a/tests/testenv.sh b/tests/testenv.sh index bdf8765ce..f2b78e113 100755 --- a/tests/testenv.sh +++ b/tests/testenv.sh @@ -88,7 +88,7 @@ esac export CoreRT_BuildOS=${CoreRT_HostOS} # Overwrite __BuildOS with WebAssembly if wasm is target build arch, but keep the CoreRT_HostOS to match the Host OS -if [ $__BuildArch == "wasm" ]; then +if [ "$__BuildArch" == "wasm" ]; then export CoreRT_BuildOS=WebAssembly fi @@ -99,3 +99,13 @@ export CoreRT_BuildOS __ScriptDir=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) export CoreRT_ToolchainDir=${__ScriptDir}/../bin/${CoreRT_BuildOS}.${CoreRT_BuildArch}.${CoreRT_BuildType} + +# CI_SPECIFIC - On CI machines, $HOME may not be set. In such a case, create a subfolder and set the variable to set. +# This is needed by CLI to function. +if [ -z "$HOME" ]; then + if [ ! -d "$__ScriptDir/../temp_home" ]; then + mkdir "$__ScriptDir/../temp_home" + fi + export HOME=$__ScriptDir/../temp_home + echo "HOME not defined; setting it to $HOME" +fi |