Merge with upstream

.gitignore

@@ -104,20 +104,6 @@ doc/images/dfepl-flow.eps
 doc/images/dfepl-flow.jpg
 doc/images/dfepl-flow.pdf
 doc/invariants-doc.texinfo
-doc/valgrind-merge.aux
-doc/valgrind-merge.cp
-doc/valgrind-merge.cps
-doc/valgrind-merge.fn
-doc/valgrind-merge.fns
-doc/valgrind-merge.html
-doc/valgrind-merge.info
-doc/valgrind-merge.ky
-doc/valgrind-merge.log
-doc/valgrind-merge.pdf
-doc/valgrind-merge.pg
-doc/valgrind-merge.toc
-doc/valgrind-merge.tp
-doc/valgrind-merge.vr
 doc/www/pubs
 
 # Files generated by java-cpp
@@ -452,6 +438,7 @@ tools/kmeans/*.o
 
 examples/**/*.class
 examples/**/*.dtrace.gz
+examples/**/*.inv.gz
 
 tests/**/*.class
 tests/**/*.comp
@@ -512,3 +499,5 @@ tests/diff-tests/schedule2/schedule2*.txt
 tests/chicory-tests/option-tests/*.txt
 tests/**/merged/
 
+# Coverity intermediate files
+java/cov-int/

.travis-build.sh

@@ -0,0 +1,11 @@
+#!/bin/bash -v
+
+# Fail the whole script if any command fails
+set -e
+
+export SHELLOPTS
+
+# TODO: The tests ought to work even if $DAIKONDIR is not set.
+export DAIKONDIR=`pwd`
+
+make nightly-test

.travis.yml

@@ -0,0 +1,52 @@
+language: java
+
+## Version for Ubuntu 14.04 Trusty.
+## Problem: The job times out on travis-ci.org, but the container-based version
+## does not.
+# script: make DAIKONDIR=`pwd` nightly-test
+# sudo: required
+# dist: trusty
+# before_install:
+#   - sudo apt-get update -qq
+#   - sudo apt-get install -qq graphviz texinfo texlive
+
+## Version for container-based infrastructure.
+## Skip generating the manual because the version of makeinfo installed
+## on Ubuntu 12.04 Precise doesn't take the --pdf command-line option.
+script: make DAIKONDIR=`pwd` nightly-test-except-doc-pdf
+sudo: false
+addons:
+  apt:
+    packages:
+      - graphviz
+      - texi2html
+      - texinfo
+  ## Enable this when you wish to see JUnit reports.
+  ## Disable to minimize use of Amazon S3.
+  # artifacts:
+  #   paths:
+  #     # "find tests -print" produces too long a command line
+  #     - $(find tests -name '*txt*' -print | tr "\n" ":")
+  #     - $(find tests -name '*decls*' -print | tr "\n" ":")
+  #   s3_region: "us-west-2"
+  #   debug: true
+# On Travis-CI's Ubuntu 12.04 infrastructure, makeinfo does not take the
+# --split=chapter command-line argument but texi2html does.
+env: TEXI2HTML=texi2html
+
+jdk:
+  - oraclejdk8
+#  - oraclejdk7
+  - openjdk7
+
+after_success:
+  - |
+      if [[ ($TRAVIS_BRANCH == master) &&
+            ($TRAVIS_PULL_REQUEST == false) &&
+            ( (! $TRAVIS_JOB_NUMBER == *.*) || ($TRAVIS_JOB_NUMBER == *.1) ) ]] ; then
+        curl -LO https://raw.github.com/mernst/plume-lib/master/bin/trigger-travis.sh
+        sh trigger-travis.sh typetests daikon-typecheck $TRAVISTOKEN
+      fi
+
+git:
+  depth: 3