Skip to content
This repository was archived by the owner on Sep 27, 2019. It is now read-only.

Commit 980652a

Browse files
authored
Merge pull request #1126 from tcm-marcel/fix/travis_failing_tests_ignored
Fix travis build to check status of tests and benchmarks
2 parents bf33cd6 + 48d2877 commit 980652a

File tree

3 files changed

+21
-6
lines changed

3 files changed

+21
-6
lines changed

.travis.yml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,15 @@ matrix:
3333
- PELOTON_BUILD_TYPE=Debug
3434
# COVERALLS: we run coveralls only for one compiler
3535
- COVERALLS=On
36-
# only run tests if the build itself succeeded
37-
after_success:
36+
# override script value to run also tests and benchmarks
37+
script:
38+
# create build directory
39+
- mkdir build
40+
- cd build
41+
# run cmake. NOTE: the PATH is made explicit to avoid automatic selection of the preinstalled llvm version in the Travis trusty image
42+
- PATH=/usr/lib/llvm-3.7/bin:/usr/bin:$PATH cmake -DCOVERALLS=$COVERALLS -DCMAKE_PREFIX_PATH=`llvm-config-3.7 --prefix` -DCMAKE_BUILD_TYPE=$PELOTON_BUILD_TYPE -DUSE_SANITIZER=Address ..
43+
# build
44+
- make -j4
3845
# run tests
3946
- if [[ $TRAVIS_OS_NAME != 'osx' ]]; then make check -j4; fi
4047
- if [[ $TRAVIS_OS_NAME == 'osx' ]]; then ASAN_OPTIONS=detect_container_overflow=0 make check -j4; fi
@@ -67,8 +74,15 @@ matrix:
6774
- CC=gcc-4.8
6875
- PELOTON_BUILD_TYPE=Release
6976
- COVERALLS=Off
70-
# only run tests if the build itself succeeded
71-
after_success:
77+
# override script value to run also tests and benchmarks
78+
script:
79+
# create build directory
80+
- mkdir build
81+
- cd build
82+
# run cmake. NOTE: the PATH is made explicit to avoid automatic selection of the preinstalled llvm version in the Travis trusty image
83+
- PATH=/usr/lib/llvm-3.7/bin:/usr/bin:$PATH cmake -DCOVERALLS=$COVERALLS -DCMAKE_PREFIX_PATH=`llvm-config-3.7 --prefix` -DCMAKE_BUILD_TYPE=$PELOTON_BUILD_TYPE -DUSE_SANITIZER=Address ..
84+
# build
85+
- make -j4
7286
# run tests
7387
- if [[ $TRAVIS_OS_NAME != 'osx' ]]; then make check -j4; fi
7488
- if [[ $TRAVIS_OS_NAME == 'osx' ]]; then ASAN_OPTIONS=detect_container_overflow=0 make check -j4; fi
@@ -129,6 +143,7 @@ before_script:
129143
# first, run source_validator
130144
- python ./script/validators/source_validator.py
131145

146+
# build peloton (override this value to execute tests)
132147
script:
133148
# create build directory
134149
- mkdir build

script/testing/jdbc/src/PelotonErrorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class PelotonErrorTest {
2323
private static final String DDL = "CREATE TABLE foo(id integer PRIMARY KEY, year integer);";
2424

2525
private static Connection makeConnection(String host, int port, String username, String pass) throws SQLException {
26-
String url = String.format("jdbc:postgresql://%s:%d/pavlo", host, port);
26+
String url = String.format("jdbc:postgresql://%s:%d/default_database", host, port);
2727
Connection conn = DriverManager.getConnection(url, username, pass);
2828
return conn;
2929
}

script/testing/jdbc/src/PelotonTypeTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class PelotonTypeTest {
3434

3535

3636
private static Connection makeConnection(String host, int port, String username, String pass) throws SQLException {
37-
String url = String.format("jdbc:postgresql://%s:%d/pavlo", host, port);
37+
String url = String.format("jdbc:postgresql://%s:%d/default_database", host, port);
3838
Connection conn = DriverManager.getConnection(url, username, pass);
3939
return conn;
4040
}

0 commit comments

Comments
 (0)