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

Workaround for F# smoke-tests.

Browse source
This commit is contained in:
Chris Rummel 2021-10-22 09:54:00 -05:00
parent c29087f7a2
commit 298effbfcc
No known key found for this signature in database
GPG key ID: DB9B2B231CB67DC7
1 changed files with 32 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/SourceBuild/tarball/content/smoke-test.sh
View file

@ -247,21 +247,39 @@ function doCommand() {
wait $! wait $!
echo " terminated with exit code $?" | tee -a "$logFile" echo " terminated with exit code $?" | tee -a "$logFile"
elif [ "$1" == "multi-rid-publish" ]; then elif [ "$1" == "multi-rid-publish" ]; then
runPublishScenarios() { if [ "$lang" == "F#" ]; then
"${dotnetCmd}" publish --self-contained false /bl:"${binlogPrefix}publish-fx-dep.binlog" # F# tries to use a truncated version number unless we pass it this flag. see https://github.com/dotnet/source-build/issues/2554
"${dotnetCmd}" publish --self-contained true -r "$targetRid" /bl:"${binlogPrefix}publish-self-contained-${targetRid}.binlog" runPublishScenarios() {
"${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-portable.binlog" "${dotnetCmd}" publish --self-contained false /bl:"${binlogPrefix}publish-fx-dep.binlog" /p:_NETCoreSdkIsPreview=true
} "${dotnetCmd}" publish --self-contained true -r "$targetRid" /bl:"${binlogPrefix}publish-self-contained-${targetRid}.binlog" /p:_NETCoreSdkIsPreview=true
"${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-portable.binlog" /p:_NETCoreSdkIsPreview=true
}
else
runPublishScenarios() {
"${dotnetCmd}" publish --self-contained false /bl:"${binlogPrefix}publish-fx-dep.binlog"
"${dotnetCmd}" publish --self-contained true -r "$targetRid" /bl:"${binlogPrefix}publish-self-contained-${targetRid}.binlog"
"${dotnetCmd}" publish --self-contained true -r linux-x64 /bl:"${binlogPrefix}publish-self-contained-portable.binlog"
}
fi
if [ "$projectOutput" == "true" ]; then if [ "$projectOutput" == "true" ]; then
runPublishScenarios | tee -a "$logFile" runPublishScenarios | tee -a "$logFile"
else else
runPublishScenarios >> "$logFile" 2>&1 runPublishScenarios >> "$logFile" 2>&1
fi fi
else else
if [ "$projectOutput" == "true" ]; then if [ "$lang" == "F#" ]; then
"${dotnetCmd}" $1 /bl:"$binlog" | tee -a "$logFile" # F# tries to use a truncated version number unless we pass it this flag. see https://github.com/dotnet/source-build/issues/2554
if [ "$projectOutput" == "true" ]; then
"${dotnetCmd}" $1 /bl:"$binlog" /p:_NETCoreSdkIsPreview=true | tee -a "$logFile"
else
"${dotnetCmd}" $1 /bl:"$binlog" /p:_NETCoreSdkIsPreview=true >> "$logFile" 2>&1
fi
else else
"${dotnetCmd}" $1 /bl:"$binlog" >> "$logFile" 2>&1 if [ "$projectOutput" == "true" ]; then
"${dotnetCmd}" $1 /bl:"$binlog" | tee -a "$logFile"
else
"${dotnetCmd}" $1 /bl:"$binlog" >> "$logFile" 2>&1
fi
fi fi
fi fi
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
@ -305,7 +323,8 @@ function runAllTests() {
doCommand VB xunit new restore test doCommand VB xunit new restore test
doCommand VB mstest new restore test doCommand VB mstest new restore test
doCommand F# console new restore build run multi-rid-publish # "run" was removed from the list below. see https://github.com/dotnet/source-build/issues/2554
doCommand F# console new restore build multi-rid-publish
doCommand F# classlib new restore build multi-rid-publish doCommand F# classlib new restore build multi-rid-publish
doCommand F# xunit new restore test doCommand F# xunit new restore test
doCommand F# mstest new restore test doCommand F# mstest new restore test
@ -334,10 +353,12 @@ function runWebTests() {
# doCommand C# blazorwasm "$@" new restore build run publish # doCommand C# blazorwasm "$@" new restore build run publish
doCommand C# blazorserver "$@" new restore build run publish doCommand C# blazorserver "$@" new restore build run publish
doCommand F# web "$@" new restore build run multi-rid-publish # "run" was removed from the list below. see https://github.com/dotnet/source-build/issues/2554
doCommand F# web "$@" new restore build multi-rid-publish
# Requires prereqs (non-source-built packages) - re-enable with https://github.com/dotnet/source-build/issues/2550 # Requires prereqs (non-source-built packages) - re-enable with https://github.com/dotnet/source-build/issues/2550
# doCommand F# mvc "$@" new restore build run multi-rid-publish # doCommand F# mvc "$@" new restore build run multi-rid-publish
doCommand F# webapi "$@" new restore build run multi-rid-publish # "run" was also removed from this set, same issue: https://github.com/dotnet/source-build/issues/2554
doCommand F# webapi "$@" new restore build multi-rid-publish
} }
function runXmlDocTests() { function runXmlDocTests() {