summaryrefslogtreecommitdiff
path: root/build-test.cmd
diff options
context:
space:
mode:
authorRuss Keldorph <Russ.Keldorph@microsoft.com>2016-08-10 17:22:19 (GMT)
committerRuss Keldorph <Russ.Keldorph@microsoft.com>2016-08-10 17:24:30 (GMT)
commitdec551ad4c739d211ea2bb62f4f9762865e571bd (patch)
tree4900a08076027011d94b1cbf819d2f8a358fdef1 /build-test.cmd
parent571b963cd4f7af8674d1031c4adefb3d8bc47618 (diff)
downloadcoreclr-dec551ad4c739d211ea2bb62f4f9762865e571bd.zip
coreclr-dec551ad4c739d211ea2bb62f4f9762865e571bd.tar.gz
coreclr-dec551ad4c739d211ea2bb62f4f9762865e571bd.tar.bz2
Re-enable creating Tests_Native* log files
Recently we seem to have lost the ability to generate Tests_Native logs. Currently, there are many build warnings that don't appear in any of the logs because the native test build output is going to the console only. The lines I'm adding are already duplicated other times in the same file, so they are a candidate for refactoring, but I'll leave that for others.
Diffstat (limited to 'build-test.cmd')
-rw-r--r--build-test.cmd17
1 files changed, 15 insertions, 2 deletions
diff --git a/build-test.cmd b/build-test.cmd
index dc7de7c..282a381 100644
--- a/build-test.cmd
+++ b/build-test.cmd
@@ -158,8 +158,21 @@ if defined __ToolsetDir (
)
set __BuildLogRootName=Tests_Native
-call %__ProjectDir%\run.cmd build -Project="%__NativeTestIntermediatesDir%\install.vcxproj" %__msbuildNativeArgs% %__RunArgs% %__unprocessedBuildArgs%
-if errorlevel 1 exit /b 1
+set __BuildLog=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.log
+set __BuildWrn=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.wrn
+set __BuildErr=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.err
+set __msbuildLog=/flp:Verbosity=normal;LogFile="%__BuildLog%"
+set __msbuildWrn=/flp1:WarningsOnly;LogFile="%__BuildWrn%"
+set __msbuildErr=/flp2:ErrorsOnly;LogFile="%__BuildErr%"
+
+call %__ProjectDir%\run.cmd build -Project="%__NativeTestIntermediatesDir%\install.vcxproj" -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__msbuildNativeArgs% %__RunArgs% %__unprocessedBuildArgs%
+if errorlevel 1 (
+ echo %__MsgPrefix%Error: build failed. Refer to the build log files for details:
+ echo %__BuildLog%
+ echo %__BuildWrn%
+ echo %__BuildErr%
+ exit /b 1
+)
:skipnative