mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Enable tests on linux portable build.

Browse source
This commit is contained in:
Eric Erhardt 2017-03-16 17:28:10 -05:00
parent ae6c0d17dc
commit c492e714e6
2 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
netci.groovy
View file

@ -60,11 +60,7 @@ platformList.each { platform ->
Utilities.setMachineAffinity(newJob, osUsedForMachineAffinity, 'latest-or-auto') Utilities.setMachineAffinity(newJob, osUsedForMachineAffinity, 'latest-or-auto')
Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}") Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")
// Remove this check once tests work for 2.0. Until that time Linux portable tests will fail so we Utilities.addMSTestResults(newJob, '**/*.trx')
// don't run the tests and there won't be any .trx file.
if (os != 'Linux') {
Utilities.addMSTestResults(newJob, '**/*.trx')
}
Utilities.addGithubPRTriggerForBranch(newJob, branch, "${os} ${architecture} ${configuration} Build") Utilities.addGithubPRTriggerForBranch(newJob, branch, "${os} ${architecture} ${configuration} Build")
} }

3
run-build.sh
View file

@ -98,8 +98,7 @@ while [[ $# > 0 ]]; do
;; ;;
--linux-portable) --linux-portable)
LINUX_PORTABLE_INSTALL_ARGS="--runtime-id linux-x64" LINUX_PORTABLE_INSTALL_ARGS="--runtime-id linux-x64"
# Until we get test support for 2.0 we need to pass in the targets without test. CUSTOM_BUILD_ARGS="/p:Rid=\"linux-x64\" /p:OSName=\"linux\""
CUSTOM_BUILD_ARGS="/p:Rid=\"linux-x64\" /p:OSName=\"linux\" /p:CLITargets=\"Prepare;Compile;Package;Publish\""
args=( "${args[@]/$1}" ) args=( "${args[@]/$1}" )
;; ;;
--help) --help)