X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=maint%2Ftravis-ci_scripts%2F10_before_install.bash;h=7a5c5fe90b9d83e9f8583703fdda41d02f02fcf6;hb=482a1cf7a2ae4ccc014c6dd361128c3535bff26a;hp=a53b7ee49b8ba2a2b79dd3c59f279072df74bf7f;hpb=e082408136cd924db8681d890c8c6493bcdb4d90;p=dbsrgits%2FDBIx-Class.git

diff --git a/maint/travis-ci_scripts/10_before_install.bash b/maint/travis-ci_scripts/10_before_install.bash
index a53b7ee..7a5c5fe 100755
--- a/maint/travis-ci_scripts/10_before_install.bash
+++ b/maint/travis-ci_scripts/10_before_install.bash
@@ -3,33 +3,26 @@
 source maint/travis-ci_scripts/common.bash
 if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] ; then return ; fi
 
-if [[ -n "$BREWVER" ]] ; then
-  # .travis.yml already restricts branches to master, topic/* and smoke/*
-  # do some extra short-circuiting here
-
-  # when smoking master do not attempt bleadperl (not release-critical)
-  if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then
-    echo_err "$(tstamp) pull-request smoking with custom perl compilation requested - bailing out"
-    export SHORT_CIRCUIT_SMOKE=1
-  elif [[ "$TRAVIS_BRANCH" = "master" ]] && [[ "$BREWVER" = "blead" ]]; then
-    echo_err "$(tstamp) master branch is not smoked with bleadperl - bailing out"
-    export SHORT_CIRCUIT_SMOKE=1
-  # on topic/ branches test only with travis perls
-  elif [[ "$TRAVIS_BRANCH" =~ "topic/" ]]; then
-    echo_err "$(tstamp) non-smoke branch and custom perl compilation requested - bailing out"
-    export SHORT_CIRCUIT_SMOKE=1
-  fi
-
-  if [[ -n "$SHORT_CIRCUIT_SMOKE" ]]; then
-    sleep 20  # give the console time to attach, otherwise it hangs
-    return  # this is like an `exit 0` in sourcing
-  fi
+# .travis.yml already restricts branches to master, topic/* and smoke/*
+# do some extra short-circuiting here
+
+# when smoking master do not attempt bleadperl (not release-critical)
+if [[ "$TRAVIS_BRANCH" = "master" ]] && [[ "$BREWVER" = "blead" ]]; then
+  echo_err "$(tstamp) master branch is not smoked with bleadperl - bailing out"
+  export SHORT_CIRCUIT_SMOKE=1
 fi
 
-# different boxes we run on may have different amount of hw threads
-# hence why we need to query
-# result is 1.5 times the physical threads
-export NUMTHREADS=$(( ( $(cut -f 2 -d '-' /sys/devices/system/cpu/online) + 1 ) * 15 / 10  ))
+if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] ; then return ; fi
+
+# Different boxes we run on may have different amount of hw threads
+# Hence why we need to query
+# Originally we used to read /sys/devices/system/cpu/online
+# but it is not available these days (odd). Thus we fall to
+# the alwas-present /proc/cpuinfo
+# The oneliner is a tad convoluted - basicaly what we do is
+# slurp the entire file and get the index off the last
+# `processor    : XX` line
+export NUMTHREADS=$(( $(perl -0777 -n -e 'print (/ (?: .+ ^ processor \s+ : \s+ (\d+) ) (?! ^ processor ) /smx)' < /proc/cpuinfo) + 1 ))
 
 if [[ "$CLEANTEST" != "true" ]]; then
 ### apt-get invocation - faster to grab everything at once
@@ -66,35 +59,41 @@ if [[ "$CLEANTEST" != "true" ]]; then
     wait
     sleep 1
   '
-  run_or_err "Re-configuring Firebird" "
-    sync
-    DEBIAN_FRONTEND=text sudo expect -c '$EXPECT_FB_SCRIPT'
-    sleep 1
-    sync
-    # restart the server for good measure
-    sudo /etc/init.d/firebird2.5-super stop || true
-    sleep 1
-    sync
-    sudo /etc/init.d/firebird2.5-super start
-    sleep 1
-    sync
-  "
-
   # creating testdb
   # FIXME - this step still fails from time to time >:(((
   # has to do with the FB reconfiguration I suppose
-  # for now if it fails - simply skip FB testing
-  if run_or_err "Creating Firebird TestDB" \
-    "echo \"CREATE DATABASE '/var/lib/firebird/2.5/data/dbic_test.fdb';\" | sudo isql-fb -u sysdba -p 123"
-  then
-    export DBICTEST_FIREBIRD_DSN=dbi:Firebird:dbname=/var/lib/firebird/2.5/data/dbic_test.fdb
-    export DBICTEST_FIREBIRD_USER=SYSDBA
-    export DBICTEST_FIREBIRD_PASS=123
-
-    export DBICTEST_FIREBIRD_INTERBASE_DSN=dbi:InterBase:dbname=/var/lib/firebird/2.5/data/dbic_test.fdb
-    export DBICTEST_FIREBIRD_INTERBASE_USER=SYSDBA
-    export DBICTEST_FIREBIRD_INTERBASE_PASS=123
-  fi
+  # for now if it fails twice - simply skip FB testing
+  for i in 1 2 ; do
+
+    run_or_err "Re-configuring Firebird" "
+      sync
+      DEBIAN_FRONTEND=text sudo expect -c '$EXPECT_FB_SCRIPT'
+      sleep 1
+      sync
+      # restart the server for good measure
+      sudo /etc/init.d/firebird2.5-super stop || true
+      sleep 1
+      sync
+      sudo /etc/init.d/firebird2.5-super start
+      sleep 1
+      sync
+    "
+
+    if run_or_err "Creating Firebird TestDB" \
+      "echo \"CREATE DATABASE '/var/lib/firebird/2.5/data/dbic_test.fdb';\" | sudo isql-fb -u sysdba -p 123"
+    then
+      export DBICTEST_FIREBIRD_DSN=dbi:Firebird:dbname=/var/lib/firebird/2.5/data/dbic_test.fdb
+      export DBICTEST_FIREBIRD_USER=SYSDBA
+      export DBICTEST_FIREBIRD_PASS=123
+
+      export DBICTEST_FIREBIRD_INTERBASE_DSN=dbi:InterBase:dbname=/var/lib/firebird/2.5/data/dbic_test.fdb
+      export DBICTEST_FIREBIRD_INTERBASE_USER=SYSDBA
+      export DBICTEST_FIREBIRD_INTERBASE_PASS=123
+
+      break
+    fi
+
+  done
 
 ### oracle
   # FIXME: todo