aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2018-03-22 12:56:01 -0400
committerGitHub <noreply@github.com>2018-03-22 12:56:01 -0400
commita1692ed133d7f30fa698ccf55daca8a1f0ca9dbd (patch)
tree79f03ae403ce8ddc1b1d11ea90ee8066cc8ed862
parent4e89c76db83684d4c5b86eb9186af3e33f5f4df0 (diff)
parenteaaa422c5265e65e9d175d7f3d6e58dad7d69de0 (diff)
downloadgoogletest-a1692ed133d7f30fa698ccf55daca8a1f0ca9dbd.tar.gz
googletest-a1692ed133d7f30fa698ccf55daca8a1f0ca9dbd.tar.bz2
googletest-a1692ed133d7f30fa698ccf55daca8a1f0ca9dbd.zip
Merge branch 'master' into master
-rw-r--r--appveyor.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/appveyor.yml b/appveyor.yml
index 84d9fbce..94b1c3a4 100644
--- 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"
}