Merge pull request #1314 from KevinRansom/master

KevinRansom · web-flow · commit f9c5bd585077 · 2016-07-04T08:25:05.000-07:00
Make build ci work correctly
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,5 +1,5 @@
 os: Visual Studio 2015
-
+ 
 environment:
   matrix:
     - BUILD_PROFILE: ci_part1
diff --git a/build.cmd b/build.cmd
@@ -141,7 +141,8 @@ if /i '%ARG%' == 'ci' (
     set CONF_FSHARPQA_SUITE=Smoke
 )
 
-REM These divide 'ci' into three chunks which can be done in parallel
+
+REM These divide 'ci' into two chunks which can be done in parallel
 if /i '%ARG%' == 'ci_part1' (
     set BUILD_PROTO=1
     set SKIP_EXPENSIVE_TESTS=1
diff --git a/tests/fsharpqa/Source/test.lst b/tests/fsharpqa/Source/test.lst
@@ -242,7 +242,7 @@ Misc01			ClrFx\PseudoCustomAttributes\AssemblyAlgorithmId
 Misc01			ClrFx\PseudoCustomAttributes\AssemblyConfiguration
 Misc01			ClrFx\PseudoCustomAttributes\AssemblyVersion
 Misc01			Diagnostics\async
-Misc01			Diagnostics\General
+Misc01,Diagnostics			Diagnostics\General
 Misc01			Diagnostics\NONTERM
 Misc01			Diagnostics\ParsingAtEOF
 Misc01			EntryPoint
@@ -277,4 +277,3 @@ Misc02			Stress
 Misc02			XmlDoc\Basic
 Misc02			XmlDoc\OCamlDoc
 Misc02			XmlDoc\UnitOfMeasure
-Diagnostics		Diagnostics\General

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,8 @@ if /i '%ARG%' == 'ci' (`
`141`	`141`	`set CONF_FSHARPQA_SUITE=Smoke`
`142`	`142`	`)`
`143`	`143`
`144`		`-REM These divide 'ci' into three chunks which can be done in parallel`
	`144`	`+`
	`145`	`+REM These divide 'ci' into two chunks which can be done in parallel`
`145`	`146`	`if /i '%ARG%' == 'ci_part1' (`
`146`	`147`	`set BUILD_PROTO=1`
`147`	`148`	`set SKIP_EXPENSIVE_TESTS=1`