X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=maint%2Ftravis-ci_scripts%2F10_before_install.bash;h=0f28710b3040d107a4833bf92849b57478a9e381;hb=46e71a1b3527936e885facc87a97c586d25ecc67;hp=374ed6e749de1a940d06a2ea88d9c8e5f003c828;hpb=cdd6fc401769022b829bf00f5be55685d58df15e;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/maint/travis-ci_scripts/10_before_install.bash b/maint/travis-ci_scripts/10_before_install.bash
index 374ed6e..0f28710 100755
--- a/maint/travis-ci_scripts/10_before_install.bash
+++ b/maint/travis-ci_scripts/10_before_install.bash
@@ -16,7 +16,7 @@ $(free -m -t)
 
 CI_VM_MIN_FREE_MB=2000
 if [[ "$(free -m | grep 'buffers/cache:' | perl -p -e '$_ = (split /\s+/, $_)[3]')" -lt "$CI_VM_MIN_FREE_MB" ]]; then
-  SHORT_CIRCUIT_SMOKE=1
+  export SHORT_CIRCUIT_SMOKE=1
   echo_err "
 =============================================================================
 
@@ -40,7 +40,8 @@ if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] ; then return ; fi
 #
 # We also divide the result by a factor, otherwise the travis VM gets
 # overloaded (the amount of available swap is just TOOOO damn small)
-export NUMTHREADS="$(( ( $(perl -0777 -n -e 'print (/ (?: .+ ^ processor \s+ : \s+ (\d+) ) (?! ^ processor ) /smx)' < /proc/cpuinfo) + 1 ) / 3 ))"
+# Add one to make sure it doesn't go to zero
+export NUMTHREADS="$(( ( $(perl -0777 -n -e 'print (/ (?: .+ ^ processor \s+ : \s+ (\d+) ) (?! ^ processor ) /smx)' < /proc/cpuinfo) + 1 ) / 3 + 1))"
 
 export CACHE_DIR="/tmp/poormanscache"
 
@@ -118,9 +119,11 @@ else
 
         run_or_err "Fetching and building Firebird ODBC driver" '
           cd "$(mktemp -d)"
-          wget -qO- http://sourceforge.net/projects/firebird/files/firebird-ODBC-driver/2.0.3-Release/OdbcJdbc-src-2.0.3.154.tar.gz/download | tar -xz
+          wget -O- https://downloads.sourceforge.net/project/firebird/firebird-ODBC-driver/2.0.5-Release/OdbcJdbc-src-2.0.5.156.tar.gz | tar -xz
           cd OdbcJdbc/Builds/Gcc.lin
           perl -p -i -e "s|/usr/lib64|/usr/lib/x86_64-linux-gnu|g" ../makefile.environ
+          # Fix illegal string concatenation error under C++11
+          perl -p -i -e "s|(\"\.\")| \$1 |g" ../../SetupAttributes.h
           make -f makefile.linux
           sudo make -f makefile.linux install
         '
@@ -154,14 +157,9 @@ FileUsage       = 1
 
 ### config oracle
   if [[ "$DBICTEST_ORA" = "true" ]]; then
-    run_or_err "Installing dummy multiarch bc package" '
-      bc_tempdir="$(mktemp -d)"
-      wget -O "$bc_tempdir/bc-multiarch_1.0_all.deb" -q http://ilmari.org/bc-multiarch/bc-multiarch_1.0_all.deb
-      sudo dpkg -i "$bc_tempdir/bc-multiarch_1.0_all.deb" || sudo bash -c "source maint/travis-ci_scripts/common.bash && apt_install -f"
-    '
-
-    run_or_err "Cloning poor man's cache from github" "git clone --depth=1 --single-branch --branch=oracle/10.2.0 https://github.com/poortravis/poormanscache.git $CACHE_DIR && $CACHE_DIR/reassemble"
-    run_or_err "Installing OracleXE manually from deb" "sudo dpkg -i $CACHE_DIR/apt_cache/oracle-xe_10.2.0.1-1.1_i386.deb || sudo bash -c 'source maint/travis-ci_scripts/common.bash && apt_install -f'"
+    run_or_err "Cloning poor man's cache from github" "git clone --depth=1 --single-branch --branch=oracle/10.2.0 https://github.com/poormanscache/poormanscache.git $CACHE_DIR && $CACHE_DIR/reassemble"
+    run_or_err "Installing OracleXE manually from deb" \
+      "sudo dpkg -i $CACHE_DIR/apt_cache/bc-multiarch-travis_1.0_all.deb $CACHE_DIR/apt_cache/oracle-xe_10.2.0.1-1.1_i386.deb || sudo bash -c 'source maint/travis-ci_scripts/common.bash && apt_install -f'"
 
     SRV_ORA_HOME=/usr/lib/oracle/xe/app/oracle/product/10.2.0/server
 
@@ -218,7 +216,7 @@ FileUsage       = 1
 
     run_or_err "Create Oracle users" "ORACLE_SID=XE ORACLE_HOME=$SRV_ORA_HOME $SRV_ORA_HOME/bin/sqlplus -L -S system/adminpass @/dev/stdin <<< '
       CREATE USER $DBICTEST_ORA_USER IDENTIFIED BY $DBICTEST_ORA_PASS;
-      GRANT connect,resource TO $DBICTEST_ORA_USER;
+      GRANT create view,connect,resource TO $DBICTEST_ORA_USER;
       CREATE USER $DBICTEST_ORA_EXTRAUSER_USER IDENTIFIED BY $DBICTEST_ORA_EXTRAUSER_PASS;
       GRANT connect,resource TO $DBICTEST_ORA_EXTRAUSER_USER;
     '"