[ Travis ] Merged latex-html-test into non-require-stdlib.

.travis.yml

@@ -21,6 +21,7 @@ ghc:
 # make fail
 # make interaction
 # make interactive
+# make latex-html-test
 # make examples
 # make api-test
 # make tests
@@ -36,15 +37,13 @@ ghc:
 #
 # Other tests: These tests use a some how different set up.
 #
-# latex-html-test
 # ghc-7.8.4-transformers-0.3.0.0
 # cpp
 
 # Travis runs the builds on this order.
 env:
   - TEST=non-require-stdlib
   - TEST=require-stdlib
-  - TEST=latex-html-test
   - TEST=ghc-7.8.4-transformers-0.3.0.0
   - TEST=cpp
 
@@ -58,7 +57,7 @@ install:
 ##############################################################################
 # Installing latest versions of cabal-install, Alex and Happy
 
-  - if [ $TEST = "latex-html-test" -o $TEST = "non-require-stdlib" -o $TEST = "require-stdlib" ]; then
+  - if [ $TEST = "non-require-stdlib" -o $TEST = "require-stdlib" ]; then
        cabal install cabal-install &&
        export PATH=$HOME/.cabal/bin:$PATH &&
        cat $HOME/.cabal/config &&
@@ -76,7 +75,7 @@ install:
 # (cabal-install 1.22.4.0). See https://github.com/haskell/cabal/issues/2628.
 
   - case $TEST in
-      "non-require-stdlib" | "latex-html-test" | "require-stdlib")
+      "non-require-stdlib" | "require-stdlib")
         if [ $GHC_VERSION_TRAVIS = 7.6.3 -o $GHC_VERSION_TRAVIS = 7.8.4 ]; then
            cabal install --enable-tests --avoid-reinstalls --only-dependencies;
         else
@@ -107,7 +106,7 @@ install:
   - export BUILD_DIR=$PWD/dist
 
   - case $TEST in
-      "non-require-stdlib" | "latex-html-test" | "require-stdlib")
+      "non-require-stdlib" | "require-stdlib")
         cabal configure -v2 --builddir=$BUILD_DIR --enable-tests
         ;;
     esac
@@ -123,7 +122,7 @@ install:
 # http://www.vex.net/~trebla/haskell/cabal-cabal.xhtml).
 
   - case $TEST in
-      "latex-html-test" | "non-require-stdlib" | "require-stdlib")
+      "non-require-stdlib" | "require-stdlib")
         cabal build -v2 --builddir=$BUILD_DIR &&
         cabal copy &&
         cabal register
@@ -194,6 +193,15 @@ install:
        make install-fix-agda-whitespace;
     fi
 
+##############################################################################
+# Installing the `kpsewhich` program
+
+# This program is required by the LaTeX/HTML test-suite.
+
+  - if [ $TEST = "non-require-stdlib" ]; then
+       sudo apt-get install texlive-binaries;
+    fi
+
 ##############################################################################
 
 script:
@@ -203,32 +211,17 @@ script:
 
 ##############################################################################
 
-# Travis (i.e. Ubuntu 12.04) uses an outdated TeX Live 2009. The LaTeX
-# test-suite requires the unicode-math package which is not available
-# in this version of TeX Live (see Issue 1022).
-
-# Installing a recent version of TeX Live (e.g. TeX Live 2012) and
-# running XeLaTeX/LuaLaTeX on Travis fail randomly (see Issue 1675),
-# presumably because that consume too much memory. We just don't run
-# LaTeX/XeLaTeX/LuaLaTeX on Travis, but we still compare the generated
-# tex/html files with the golden files.
-
-# We install the `texlive-binaries` package because the `kpsewhich`
-# program is required by the LaTeX back-end.
-
-  - if [ $TEST = "latex-html-test" ]; then
-       sudo apt-get install texlive-binaries &&
-       make AGDA_TESTS_OPTIONS="" BUILD_DIR=$BUILD_DIR DONT_RUN_LATEX="Y" latex-html-test;
-    fi
-
-##############################################################################
+# We don't run LaTeX/XeLaTeX/LuaLaTeX on Travis (see Issues 1022 and
+# 1675), but we still compare the generated tex/html files with the
+# golden files.
 
   - if [ $TEST = "non-require-stdlib" ]; then
        make check-whitespace &&
        make BUILD_DIR=$BUILD_DIR succeed &&
        make AGDA_TESTS_OPTIONS="" BUILD_DIR=$BUILD_DIR fail &&
        make BUILD_DIR=$BUILD_DIR interaction &&
        make BUILD_DIR=$BUILD_DIR interactive &&
+       make AGDA_TESTS_OPTIONS="" BUILD_DIR=$BUILD_DIR DONT_RUN_LATEX="Y" latex-html-test &&
        make BUILD_DIR=$BUILD_DIR examples &&
        make BUILD_DIR=$BUILD_DIR api-test &&
        make BUILD_DIR=$BUILD_DIR tests &&