From 52bb6c79fb4ef021e9b18b7c75476364991166b3 Mon Sep 17 00:00:00 2001
From: SANO Masatoshi <snmsts@gmail.com>
Date: Fri, 15 Jan 2016 18:24:57 +0900
Subject: [PATCH] make test on travis.yml

---
 .travis.yml | 12 +++++++-----
 Makefile.am |  3 +--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 212f7b7..644f65a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,9 +9,10 @@ env:
     - METHOD=cross XCC=i686-w64-mingw32-gcc HOST="--host=i686-w64-mingw32" PREFIX="--prefix=/usr/i686-w64-mingw32"
     - METHOD=debian
     - METHOD=documents
+    - METHOD=test LISP=sbcl-bin
     - METHOD=valgrind XCFLAGS="-g -O0"
     - METHOD=brew
-    - METHOD=test LISP=sbcl/1.1.14
+    - METHOD=ci LISP=sbcl/1.1.14
     - METHOD=ci LISP=sbcl
     - METHOD=ci LISP=ecl
     - METHOD=ci LISP=clisp
@@ -73,10 +74,11 @@ script:
        sh bootstrap;CFLAGS=$XCFLAGS ./configure --disable-dependency-tracking --disable-maintainer-mode;make;sudo make install;make maintainer-clean; fi
   - if [ "$METHOD" = "cross" ]; then CC=$XCC ./configure ${PREFIX} ${HOST};make; fi
   - if [ "$METHOD" = "test" ]; then ros install $LISP; fi
-  - if [ "$METHOD" = "test" ] || [ "$METHOD" = "brew" ] || [ "$METHOD" = "ci" ]; then ros version; fi
-  - if [ "$METHOD" = "test" ] || [ "$METHOD" = "brew" ] || [ "$METHOD" = "ci" ]; then ros version=t run; fi
-  - if [ "$METHOD" = "test" ] || [ "$METHOD" = "brew" ] || [ "$METHOD" = "ci" ]; then ros config; fi
-  - if [ "$METHOD" = "test" ] || [ "$METHOD" = "brew" ] || [ "$METHOD" = "ci" ]; then ros -s prove-asdf -s quri-test -e "(asdf:test-system :quri-test)"; fi
+  - if [ "$METHOD" = "brew" ] || [ "$METHOD" = "ci" ]; then ros version; fi
+  - if [ "$METHOD" = "brew" ] || [ "$METHOD" = "ci" ]; then ros version=t run; fi
+  - if [ "$METHOD" = "brew" ] || [ "$METHOD" = "ci" ]; then ros config; fi
+  - if [ "$METHOD" = "brew" ] || [ "$METHOD" = "ci" ]; then ros -s prove-asdf -s quri-test -e "(asdf:test-system :quri-test)"; fi
+  - if [ "$METHOD" = "test" ]; then ; make test ;fi
   - if [ "$METHOD" = "ci" ]; then ros -q run && [`ros -q run 2>&1` == ""]; fi
   - if [ "$METHOD" = "ci" ] && [ "$LISP" = "sbcl-bin" ]; then [`ros -e "(ros:ignore-shebang)" -e '(loop for x in (directory "src/lisp/*.ros") do (load x))' 2>&1` == ""]; fi
   - if [ x$TRAVIS_TAG != x ] && [ $METHOD = debian ]; then ros ./scripts/debian.ros; fi
diff --git a/Makefile.am b/Makefile.am
index e03dd51..6793487 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,5 @@ prepare-release:
 release:
 	ros scripts/release.ros release
 test:
-	ros -L sbcl-bin t/roswell.ros
-	ros -L ccl-bin t/roswell.ros
+	ros t/roswell.ros
 .PHONY: debian prepare-release test