aboutsummaryrefslogtreecommitdiff
path: root/appveyor.yml
diff options
context:
space:
mode:
authorFeng Xiao <xfxyjwf@gmail.com>2015-06-17 13:12:11 -0700
committerFeng Xiao <xfxyjwf@gmail.com>2015-06-17 13:12:11 -0700
commite9a122eb19ec54dbca15da80355ed0c17cada9b1 (patch)
treefac37489873ccf47777b2e652db580f9315d7bc7 /appveyor.yml
parentb36395b2bac88f70070544c325bc09234cb1f1a6 (diff)
parent818c5eee08840355d70d2f3bdf1a2f17986a5e70 (diff)
downloadprotobuf-e9a122eb19ec54dbca15da80355ed0c17cada9b1.tar.gz
protobuf-e9a122eb19ec54dbca15da80355ed0c17cada9b1.tar.bz2
protobuf-e9a122eb19ec54dbca15da80355ed0c17cada9b1.zip
Merge pull request #501 from xfxyjwf/down
Down-integrate from internal code base.
Diffstat (limited to 'appveyor.yml')
-rw-r--r--appveyor.yml9
1 files changed, 5 insertions, 4 deletions
diff --git a/appveyor.yml b/appveyor.yml
index 91862230..3653c041 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,9 +12,9 @@ environment:
- BUILD_DLL: ON
install:
- - ps: Start-FileDownload https://googletest.googlecode.com/files/gtest-1.7.0.zip
- - 7z x gtest-1.7.0.zip
- - rename gtest-1.7.0 gtest
+ - ps: Start-FileDownload https://googlemock.googlecode.com/files/gmock-1.7.0.zip
+ - 7z x gmock-1.7.0.zip
+ - rename gmock-1.7.0 gmock
before_build:
- if %platform%==Win32 set generator=Visual Studio 12
@@ -30,4 +30,5 @@ build_script:
- cd %configuration%
- tests.exe
-
+skip_commits:
+ message: /.*\[skip appveyor\].*/