Skip to content

Commit

Permalink
Actually use cl-coveralls not coveralls
Browse files Browse the repository at this point in the history
  • Loading branch information
libre-man committed May 24, 2020
1 parent 7f22d4e commit 7c76860
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 17 deletions.
11 changes: 2 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ addons:
env:
matrix:
- LISP=abcl
- LISP=sbcl COVERALLS=true
- LISP=sbcl-bin COVERALLS=true
- LISP=sbcl32
- LISP=ccl
- LISP=ccl32
Expand All @@ -30,14 +30,7 @@ before_script:
- echo "(defsystem :dummy-cl-travis-system)" > ~/lisp/dummy-cl-travis-system.asd

install:
- if [ -x ./install.sh ] && head -2 ./install.sh | grep '^# cl-travis' > /dev/null;
then
./install.sh;
else
curl https://raw.githubusercontent.com/sionescu/cl-travis/master/install.sh | sh;
fi
- cl -e '(ql:update-all-dists :prompt nil)'
- git clone https://github.com/fukamachi/cl-coveralls ~/lisp/cl-coveralls
- ./travis-install.bash

script:
- ./run-tests.bash
Expand Down
16 changes: 8 additions & 8 deletions run-tests.bash
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
#!/bin/bash

if [[ -n "$COVERALLS" ]]; then
cl -l unix-opts/tests -e '(values)'
cl -l unix-opts/tests -l cl-coveralls \
-e '(progn
(ql:quickload :cl-coveralls)
(coveralls:with-coveralls ()
(unix-opts/tests:run)))'
ros -e '(ql:quickload :cl-coveralls)
(cl-coveralls.impls:enable-coverage)
(asdf:load-system :unix-opts/tests)
(let (suc)
(cl-coveralls:with-coveralls (:exclude (list "tests.lisp"))
(setf suc (unix-opts/tests:run)))
(unix-opts:quit (if suc 0 1)))'

else
cl -l unix-opts/tests \
-e '(progn
(uiop:quit (if (unix-opts/tests:run) 0 1)))'
-e '(unix-opts:quit (if (unix-opts/tests:run) 0 1))'

fi
10 changes: 10 additions & 0 deletions travis-install.bash
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/bash

if [[ -n "$COVERALLS" ]]; then
curl -L https://raw.githubusercontent.com/roswell/roswell/master/scripts/install-for-ci.sh | sh
ros asdf install
ros -e '(ql:update-all-dists :prompt nil)'
else
curl https://raw.githubusercontent.com/sionescu/cl-travis/master/install.sh | sh;
cl -e '(ql:update-all-dists :prompt nil)'
fi

0 comments on commit 7c76860

Please sign in to comment.