update r840

srz-zumix · May 12, 2015 · a158f18 · a158f18
1 parent 8aaaa8b
commit a158f18
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,20 +5,20 @@ compiler:
   - gcc
 
 before_install:
-  - if [ "${CXX}" = 'g++' ] && [ "${HOST}" != 'WINE' ] && [ "${USE_COVERAGE}" != 'lcov' ]; then export USE_GCC48=1; fi
-  - if [ "${USE_GCC48}" = '1' ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi
+  - if [ "${CXX}" = 'g++' ] && [ "${HOST}" != 'WINE' ] && [ "${USE_COVERAGE}" != 'lcov' ]; then export USE_NEWEST_GCC=1; fi
+  - if [ "${USE_NEWEST_GCC}" = '1' ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi
   #- if [ "${CXX}" = 'clang++' ]; then wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -; fi
   #- if [ "${CXX}" = 'clang++' ]; then sudo add-apt-repository --yes 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise main'; fi
   #- if [ "${CXX}" = 'clang++' ]; then sudo add-apt-repository -y ppa:h-rayflood/llvm; fi
   - if [ "${HOST}" = 'WINE' ]; then sudo add-apt-repository -y ppa:ubuntu-wine/ppa; fi
   - sudo apt-get -qq update
 
 install:
-  # gcc 4.8
-  - if [ "${USE_GCC48}" = '1' ]; then sudo apt-get -qq install g++-4.8; fi
-  - if [ "${USE_GCC48}" = '1' ]; then sudo update-alternatives --install /usr/bin/gcc  gcc  /usr/bin/gcc-4.8 90; fi
-  - if [ "${USE_GCC48}" = '1' ]; then sudo update-alternatives --install /usr/bin/g++  g++  /usr/bin/g++-4.8 90; fi
-  - if [ "${USE_GCC48}" = '1' ]; then sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-4.8 90;  fi
+  # gcc 5.1
+  - if [ "${USE_NEWEST_GCC}" = '1' ]; then sudo apt-get -qq install g++-5.1; fi
+  - if [ "${USE_NEWEST_GCC}" = '1' ]; then sudo update-alternatives --install /usr/bin/gcc  gcc  /usr/bin/gcc-5.1 90; fi
+  - if [ "${USE_NEWEST_GCC}" = '1' ]; then sudo update-alternatives --install /usr/bin/g++  g++  /usr/bin/g++-5.1 90; fi
+  - if [ "${USE_NEWEST_GCC}" = '1' ]; then sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-5.1 90;  fi
   # clang 3.5
   #- if [ "${CXX}" = 'clang++' ]; then sudo apt-get -qq install clang-3.5; fi
   #- if [ "${CXX}" = 'clang++' ]; then export CXX="clang++-3.5";  fi

diff --git a/shippable.yml b/shippable.yml
@@ -16,22 +16,22 @@ script:
 
 env:
   - WANDBOX_COMPILER=gcc-head
-  - WANDBOX_COMPILER=gcc-5.1.0
+#  - WANDBOX_COMPILER=gcc-5.1.0 # travis
   - WANDBOX_COMPILER=gcc-4.9.2
 #  - WANDBOX_COMPILER=gcc-4.9.1 # wercker
 #  - WANDBOX_COMPILER=gcc-4.9.0 # wercker
 #  - WANDBOX_COMPILER=gcc-4.8.2 # wercker
-#  - WANDBOX_COMPILER=gcc-4.8.1 # travis
+  - WANDBOX_COMPILER=gcc-4.8.1
   - WANDBOX_COMPILER=gcc-4.7.3
 #  - WANDBOX_COMPILER=gcc-4.6.4 # drone
   - WANDBOX_COMPILER=gcc-4.5.4
 #  - WANDBOX_COMPILER=gcc-4.4.7 # wercker
   - WANDBOX_COMPILER=gcc-4.3.6
   - WANDBOX_COMPILER=clang-head
   - WANDBOX_COMPILER=clang-3.6
-#  - WANDBOX_COMPILER=clang-3.5
+  - WANDBOX_COMPILER=clang-3.5
 #  - WANDBOX_COMPILER=clang-3.4 # travis
-  - WANDBOX_COMPILER=clang-3.3
+#  - WANDBOX_COMPILER=clang-3.3 # wercker
 #  - WANDBOX_COMPILER=clang-3.2 # wercker
 #  - WANDBOX_COMPILER=clang-3.1 # wercker
   - WANDBOX_COMPILER=clang-3.0

diff --git a/test/iutest_matcher_tests.cpp b/test/iutest_matcher_tests.cpp
@@ -579,7 +579,7 @@ IUTEST(Matcher, MatchesRegex)
 IUTEST(Matcher, ContainsRegex)
 {
 	::std::string s = "greeeeeen";
-	IUTEST_EXPECT_THAT(s, MatchesRegex("e"));
+	IUTEST_EXPECT_THAT(s, ContainsRegex("e"));
 	IUTEST_EXPECT_THAT("hogeeeeeet", ContainsRegex("hoge+"));
 }
 
@@ -591,8 +591,8 @@ IUTEST(MatcherFailure, MatchesRegex)
 
 IUTEST(MatcherFailure, ContainsRegex)
 {
-	CHECK_FAILURE( IUTEST_ASSERT_THAT("hoge", MatchesRegex("hoge+"))
-		, "ContainsRegex: hoge+");
+	CHECK_FAILURE( IUTEST_ASSERT_THAT("hoge", ContainsRegex("[0-9]"))
+		, "ContainsRegex: [0-9]");
 }
 
 #endif

diff --git a/tools/twilio/iutwilio.py b/tools/twilio/iutwilio.py
@@ -96,15 +96,17 @@ def setup(options):
 #
 # parse ini
 def parse_ini(path):
+	global account_sid
+	global auth_token
+	global my_number
+	if account_sid and auth_token and my_number:
+		return
 	ini = ConfigParser.SafeConfigParser()
 	if not os.path.exists(path):
 		sys.stderr.write('%s not found...' % path)
 		sys.exit(2)
 	ini.read(path)
 
-	global account_sid
-	global auth_token
-	global my_number
 	try:
 		account_sid = ini.get('Twilio', 'account_sid')
 		auth_token = ini.get('Twilio', 'auth_token')
@@ -173,8 +175,8 @@ def dump():
 #
 def main():
 	options = parse_command_line()
-	parse_ini(options.ini)
 	setup(options)
+	parse_ini(options.ini)
 	if options.dump:
 		dump()
 	else:

diff --git a/wercker.yml b/wercker.yml
@@ -58,6 +58,12 @@ build:
           cd tools/wandbox
           python ./iuwandbox.py ${IUWANDBOX_COMMANDLINE_OPTION} -c gcc-4.4.7
 
+    - script:
+        name: clang-3.3
+        code: |
+          cd tools/wandbox
+          python ./iuwandbox.py ${IUWANDBOX_COMMANDLINE_OPTION} -c clang-3.3
+
     - script:
         name: clang-3.2
         code: |