From 94987de744b65ca1b6ed2e9bb551b6b2f8e57bb3 Mon Sep 17 00:00:00 2001 From: Mateusz Loskot Date: Thu, 28 Feb 2013 01:11:43 +0000 Subject: [PATCH] Attempt to install oracle-xe-client on travis-ci Testing Oracle setup for the first time. Temporarily disabled ctest run. --- bin/ci/before_install.sh | 15 +++++++++++++-- bin/ci/before_script.sh | 5 +++++ bin/ci/script.sh | 8 +++++++- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/bin/ci/before_install.sh b/bin/ci/before_install.sh index 8c7e82cf6..c1698268b 100755 --- a/bin/ci/before_install.sh +++ b/bin/ci/before_install.sh @@ -2,13 +2,24 @@ # Run before_intsall actions for SOCI build at travis-ci.org # Mateusz Loskot , http://github.com/SOCI # +set -e +if [[ "$TRAVIS" != "true" ]] ; then + echo_err "Running this script makes no sense outside of travis-ci.org" + exit 1 +fi +tmstamp() { echo -n "[$(date '+%H:%M:%S')]" ; } + # Install dependencies +echo "$(tstamp) before_intsall::apt-get starting $(date)" +sudo bash -c 'echo "deb https://oss.oracle.com/debian unstable main non-free" >> /etc/apt/sources.list' sudo apt-get update -qq sudo apt-get install -qq \ libboost-dev libboost-date-time-dev \ libmyodbc unixodbc-dev odbc-postgresql \ - firebird2.5-super firebird2.5-dev -# + firebird2.5-super firebird2.5-dev \ + oracle-xe-client +echo "$(tstamp) before_intsall::apt-get finished $(date)" + # Configure Firebird # See: Non-interactive setup for travis-ci.org # http://tech.groups.yahoo.com/group/firebird-support/message/120883 diff --git a/bin/ci/before_script.sh b/bin/ci/before_script.sh index e45051136..2e2f922b9 100755 --- a/bin/ci/before_script.sh +++ b/bin/ci/before_script.sh @@ -2,6 +2,11 @@ # Run before_script actions for SOCI build at travis-ci.org # Mateusz Loskot , http://github.com/SOCI # +set -e +if [[ "$TRAVIS" != "true" ]] ; then + echo_err "Running this script makes no sense outside of travis-ci.org" + exit 1 +fi # Create local databases # MySQL (service provided) mysql --version diff --git a/bin/ci/script.sh b/bin/ci/script.sh index 0f9d944ac..ba90a2f1d 100755 --- a/bin/ci/script.sh +++ b/bin/ci/script.sh @@ -2,6 +2,11 @@ # Run script actions for SOCI build at travis-ci.org # Mateusz Loskot , http://github.com/SOCI # +set -e +if [[ "$TRAVIS" != "true" ]] ; then + echo_err "Running this script makes no sense outside of travis-ci.org" + exit 1 +fi # Build SOCI using CMake (primary build configuration) mkdir -p src/_build cd src/_build @@ -10,6 +15,7 @@ cmake \ -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_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;" \ @@ -17,4 +23,4 @@ cmake \ .. cmake --build . # Run tests -ctest -V --output-on-failure . \ No newline at end of file +#ctest -V --output-on-failure . \ No newline at end of file