You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kx...@apache.org on 2015/11/12 00:07:39 UTC
[27/50] couchdb commit: updated refs/heads/2876-js-tests to bd19653
Simplify exit on first test suite failure
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/e5a1c9b8
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/e5a1c9b8
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/e5a1c9b8
Branch: refs/heads/2876-js-tests
Commit: e5a1c9b8fa27e10216bb109ea8f2acf4611035f9
Parents: 366c856
Author: Alexander Shorin <kx...@apache.org>
Authored: Sat Oct 17 03:31:03 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Oct 19 13:47:39 2015 +0300
----------------------------------------------------------------------
.travis.yml | 2 +-
Makefile | 5 ++++-
run-tests.sh | 4 ----
3 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/e5a1c9b8/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 920a8ee..f0f7126 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ before_install:
- sudo apt-get -y install shunit2
before_script: ./configure -c --disable-docs --disable-fauxton
script:
- - ./run-tests.sh
+ - make check
language: erlang
otp_release:
- 18.1
http://git-wip-us.apache.org/repos/asf/couchdb/blob/e5a1c9b8/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index f613c75..ee202bf 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,10 @@ fauxton: share/www
.PHONY: check
# target: check - Test everything
-check: javascript eunit build-test
+check:
+ @$(MAKE) eunit
+ @$(MAKE) javascript
+ @$(MAKE) build-test
.PHONY: eunit
http://git-wip-us.apache.org/repos/asf/couchdb/blob/e5a1c9b8/run-tests.sh
----------------------------------------------------------------------
diff --git a/run-tests.sh b/run-tests.sh
deleted file mode 100755
index f8ab486..0000000
--- a/run-tests.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh -ev
-
-# Eunit/Javascript tests
-make check