Merge branch 'master' of http://github.com/souffle-lang/souffle

Merge with upstream master.

.travis/after_failure.sh

@@ -16,9 +16,6 @@
 # allowing us to debug the problem.                                       #
 #=========================================================================#
 
-set -e
-set -u
-
 pwd
 ls
 
@@ -27,6 +24,7 @@ for FI in */; do
     ls $FI
 done
 
+
 TEST_ROOT=`find . -type d -name "testsuite.dir" | head -1`
 RELEVANT_EXTENSIONS=".out .err .log"
 MAXIMUM_LINES="200"
@@ -39,6 +37,14 @@ pretty_print () {
     echo $(tput sgr0)
 }
 
+# print some helpful stats
+pretty_print "Showing git info"
+git tag
+git remote -v
+git describe --tags --abbrev=0 --always
+git describe --all --abbrev=0 --always
+git describe --tags --abbrev=0
+
 # Find the test case that we will be displaying
 CANDIDATE=`ls $TEST_ROOT | head -1`
 pretty_print "Displaying contents of failed test-case no. $CANDIDATE from $TEST_ROOT"

.travis/run.sh

@@ -5,6 +5,9 @@
 set -e
 set -x
 
+echo -n "Version: "
+git describe --tags --abbrev=0 --always
+
 # create configure files
 ./bootstrap