Merge branch 'master' into master

gennadiycivil · web-flow · commit a1692ed133d7 · 2018-03-22T12:56:01.000-04:00
diff --git a/appveyor.yml b/appveyor.yml
@@ -87,7 +87,7 @@ test_script:
     if ($env:generator -eq "MinGW Makefiles") {
         return # No test available for MinGW
     }
-    & ctest -C $env:configuration --timeout 300 --output-on-failure
+    & ctest -C $env:configuration --timeout 600 --output-on-failure
     if ($LastExitCode -ne 0) {
         throw "Exec: $ErrorMessage"
     }

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ test_script:`
`87`	`87`	`if ($env:generator -eq "MinGW Makefiles") {`
`88`	`88`	`return # No test available for MinGW`
`89`	`89`	`}`
`90`		`- & ctest -C $env:configuration --timeout 300 --output-on-failure`
	`90`	`+ & ctest -C $env:configuration --timeout 600 --output-on-failure`
`91`	`91`	`if ($LastExitCode -ne 0) {`
`92`	`92`	`throw "Exec: $ErrorMessage"`
`93`	`93`	`}`