Permalink
Browse files

Use different Oracle user for g++ and clang (#96)

Enable g++ back - testing.
  • Loading branch information...
mloskot committed Mar 7, 2013
1 parent 8fe4028 commit 7c66b43b85f5f6fbda4d8c093b1b8792e2f5cbe6
Showing with 9 additions and 2 deletions.
  1. +1 −1 .travis.yml
  2. +8 −1 bin/ci/script.sh
View
@@ -7,7 +7,7 @@ language: cpp
# Testing against two compilers will create (at least) 2 rows in build matrix
# http://about.travis-ci.org/docs/user/languages/cpp/
compiler:
#- g++ # disabled due to conflicting parallel testing against common Oracle
- g++
- clang
branches:
View
@@ -7,13 +7,20 @@ source ./bin/ci/common.sh
mkdir -p src/_build
cd src/_build
echo "$(tmstamp) *** script::cmake-config starting $(date) ***"
if [ "${CXX}" == "g++" ]
then
ORACLE_USER="soci_tester"
else
ORACLE_USER="soci_tester1"
fi
cmake \
-DSOCI_STATIC=OFF \
-DSOCI_TESTS=ON \
-DSOCI_EMPTY_TEST_CONNSTR:STRING="dummy connection" \
-DSOCI_FIREBIRD_TEST_CONNSTR:STRING="service=LOCALHOST:/tmp/soci_test.fdb user=SYSDBA password=masterkey" \
-DSOCI_MYSQL_TEST_CONNSTR:STRING="db=soci_test" \
-DSOCI_ORACLE_TEST_CONNSTR:STRING="service=brzuchol.loskot.net user=soci_tester password=soci_secret" \
-DSOCI_ORACLE_TEST_CONNSTR:STRING="service=brzuchol.loskot.net user=${ORACLE_USER} password=soci_secret" \
-DSOCI_POSTGRESQL_TEST_CONNSTR:STRING="dbname=soci_test user=postgres" \
-DSOCI_SQLITE3_TEST_CONNSTR:STRING="soci_test.db" \
-DSOCI_ODBC_TEST_POSTGRESQL_CONNSTR="FILEDSN=${PWD}/../backends/odbc/test/test-postgresql.dsn;" \

0 comments on commit 7c66b43

Please sign in to comment.