couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nsla...@apache.org
Subject [2/8] git commit: Added --disable-tests flag to make my job easier
Date Sat, 13 Oct 2012 15:40:50 GMT
Added --disable-tests flag to make my job easier


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/a4348571
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/a4348571
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/a4348571

Branch: refs/heads/docs
Commit: a43485714273d2e9689b632ec9059dfbb0764fa3
Parents: 53680d6
Author: Noah Slater <nslater@apache.org>
Authored: Sat Oct 13 16:23:52 2012 +0100
Committer: Noah Slater <nslater@apache.org>
Committed: Sat Oct 13 16:23:52 2012 +0100

----------------------------------------------------------------------
 Makefile.am                      |    8 ++++++++
 configure.ac                     |    7 +++++++
 src/couch_mrview/Makefile.am     |    2 ++
 src/couch_replicator/Makefile.am |    2 ++
 4 files changed, 19 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/a4348571/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index d6836d2..0a95915 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -91,17 +91,24 @@ THANKS.gz: $(top_srcdir)/THANKS
 	@rm $(top_builddir)/THANKS.tmp
 
 check: dev check-js
+if RUN_TESTS
 	$(top_builddir)/test/etap/run $(top_srcdir)/test/etap
+endif
 
 check-js: dev
+if RUN_TESTS
 if USE_CURL
 	$(top_builddir)/test/javascript/run
 endif
+endif
 
 check-etap: dev
+if RUN_TESTS
 	$(top_builddir)/test/etap/run $(top_srcdir)/test/etap
+endif
 
 cover: dev
+if RUN_TESTS
 	rm -f cover/*.coverdata
 	COVER=1 COVER_BIN=./src/couchdb/ $(top_builddir)/test/etap/run
 	SRC=./src/couchdb/ \
@@ -109,6 +116,7 @@ cover: dev
 		-pa src/etap \
 		-eval 'etap_report:create()' \
 	    -s init stop > /dev/null 2>&1
+endif
 
 dev: all
 	@echo "This command is intended for developers to use;"

http://git-wip-us.apache.org/repos/asf/couchdb/blob/a4348571/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 7ce4842..04270f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -437,6 +437,11 @@ AC_ARG_ENABLE([launchd], [AC_HELP_STRING([--disable-launchd],
     use_launchd=$enableval
 ], [])
 
+AC_ARG_ENABLE([tests], [AC_HELP_STRING([--disable-tests],
+    [skip tests during build])], [
+    tests_enabled=$enableval
+], [])
+
 AC_ARG_ENABLE([native-mochijson], [AC_HELP_STRING([--enable-native-mochijson],
     [compile mochijson to native code (EXPERIMENTAL)])], [
     native_mochijson_enabled=$enableval
@@ -444,6 +449,7 @@ AC_ARG_ENABLE([native-mochijson], [AC_HELP_STRING([--enable-native-mochijson],
 
 init_enabled=false
 launchd_enabled=false
+tests_enabled=false
 
 if test "$use_init" = "yes"; then
    AC_MSG_CHECKING(location of init directory)
@@ -493,6 +499,7 @@ AM_CONDITIONAL([LAUNCHD], [test x${launchd_enabled} = xtrue])
 AM_CONDITIONAL([HELP2MAN], [test x${help2man_enabled} = xtrue])
 AM_CONDITIONAL([USE_NATIVE_MOCHIJSON], [test x${native_mochijson_enabled} = xyes])
 AM_CONDITIONAL([USE_CURL], [test x${use_curl} = xyes])
+AM_CONDITIONAL([RUN_TESTS], [test x$skip_tests = xyes])
 
 AC_SUBST([package_author_name], ["LOCAL_PACKAGE_AUTHOR_NAME"])
 AC_SUBST([package_author_address], ["LOCAL_PACKAGE_AUTHOR_ADDRESS"])

http://git-wip-us.apache.org/repos/asf/couchdb/blob/a4348571/src/couch_mrview/Makefile.am
----------------------------------------------------------------------
diff --git a/src/couch_mrview/Makefile.am b/src/couch_mrview/Makefile.am
index b544cb7..0360c2a 100644
--- a/src/couch_mrview/Makefile.am
+++ b/src/couch_mrview/Makefile.am
@@ -57,7 +57,9 @@ EXTRA_DIST = $(include_files) $(source_files) $(test_files)
 CLEANFILES = $(compiled_files)
 
 check:
+if RUN_TESTS
 	$(abs_top_builddir)/test/etap/run $(abs_top_srcdir)/src/couch_mrview/test
+endif
 
 ebin/%.app: src/%.app.src
 	@mkdir -p ebin/

http://git-wip-us.apache.org/repos/asf/couchdb/blob/a4348571/src/couch_replicator/Makefile.am
----------------------------------------------------------------------
diff --git a/src/couch_replicator/Makefile.am b/src/couch_replicator/Makefile.am
index 746a62f..75326ab 100644
--- a/src/couch_replicator/Makefile.am
+++ b/src/couch_replicator/Makefile.am
@@ -60,7 +60,9 @@ EXTRA_DIST = $(include_files) $(source_files) $(test_files)
 CLEANFILES = $(compiled_files)
 
 check:
+if RUN_TESTS
 	$(abs_top_builddir)/test/etap/run $(abs_top_srcdir)/src/couch_replicator/test
+endif
 
 ebin/%.app: src/%.app.src
 	@mkdir -p ebin/


Mime
View raw message