Skip to content

Commit

Permalink
Fix travis
Browse files Browse the repository at this point in the history
Summary: use bash for the options test to not get some strange error about parenthesis
Closes #64

Reviewed By: @nikunjy

Differential Revision: D2401190

Pulled By: @ldemailly
  • Loading branch information
ldemailly committed Sep 1, 2015
1 parent 323d82e commit 401dbff
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
3 changes: 2 additions & 1 deletion BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,5 +162,6 @@ You may get certificate errors getting gmock and need to permanently
accept the certificate from the commandline

```
echo p | svn list https://googlemock.googlecode.com
svn list https://googlemock.googlecode.com
# type "p", then ignore the output and make again
```
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ cmake_minimum_required(VERSION 3.2)
# There is no C per se in WDT but if you use CXX only here many checks fail
# Version is Major.Minor.YYMMDDX for up to 10 releases per day
# Minor currently is also the protocol version - has to match with Protocol.cpp
project("WDT" LANGUAGES C CXX VERSION 1.16.1508310)
project("WDT" LANGUAGES C CXX VERSION 1.16.1508311)

# On MacOS this requires the latest (master) CMake (and/or CMake 3.1.1/3.2)
set(CMAKE_CXX_STANDARD 11)
Expand Down
4 changes: 2 additions & 2 deletions WdtConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

#define WDT_VERSION_MAJOR 1
#define WDT_VERSION_MINOR 16
#define WDT_VERSION_BUILD 1508310
#define WDT_VERSION_BUILD 1508311
// Add -fbcode to version str
#define WDT_VERSION_STR "1.16.1508310-fbcode"
#define WDT_VERSION_STR "1.16.1508311-fbcode"
// Tie minor and proto version
#define WDT_PROTOCOL_VERSION WDT_VERSION_MINOR

Expand Down
2 changes: 1 addition & 1 deletion wdt_option_type_test.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /bin/sh
#! /bin/bash

# Tests for option types can not be run in the same process because gflags
# can not be reset to default condition. This script runs all the tests one by
Expand Down

0 comments on commit 401dbff

Please sign in to comment.