You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2012/11/19 17:05:01 UTC

[1/3] git commit: Add `make dev-test` target for test suite.

Updated Branches:
  refs/heads/test-for-unexported-functions [created] b5613022e


Add `make dev-test` target for test suite.

This makes the erlang sources compliled with

    `erlc +export_all`

so that unexported functions can be tested alongside exported
ones.

This isn’t entirely baked, as I call `make clean` after `make
check` to avoid `dist`-ing binaries with +export_all.

Robert Newson suggests to have the sources compiled with
+export_all to separate location and run `make dev-text` from
that directory, which should be cleaner. Consider this a TBD.


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

Branch: refs/heads/test-for-unexported-functions
Commit: 9a805b11a4c2b76d250d7453361840945311c3d7
Parents: 9322770
Author: Jan Lehnardt <ja...@apache.org>
Authored: Mon Nov 19 17:00:20 2012 +0100
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Mon Nov 19 17:03:51 2012 +0100

----------------------------------------------------------------------
 Makefile.am             |   13 +++++++++----
 src/couchdb/Makefile.am |    2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/9a805b11/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index d6836d2..ce33f95 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -90,18 +90,19 @@ THANKS.gz: $(top_srcdir)/THANKS
 	-gzip -9 < $(top_builddir)/THANKS.tmp > $@
 	@rm $(top_builddir)/THANKS.tmp
 
-check: dev check-js
+check: dev-test check-js
 	$(top_builddir)/test/etap/run $(top_srcdir)/test/etap
+	$(MAKE) clean
 
-check-js: dev
+check-js: dev-test
 if USE_CURL
 	$(top_builddir)/test/javascript/run
 endif
 
-check-etap: dev
+check-etap: dev-test
 	$(top_builddir)/test/etap/run $(top_srcdir)/test/etap
 
-cover: dev
+cover: dev-test
 	rm -f cover/*.coverdata
 	COVER=1 COVER_BIN=./src/couchdb/ $(top_builddir)/test/etap/run
 	SRC=./src/couchdb/ \
@@ -110,6 +111,10 @@ cover: dev
 		-eval 'etap_report:create()' \
 	    -s init stop > /dev/null 2>&1
 
+dev-test:
+	$(MAKE) clean
+	ERLC_FLAGS_EXT="+export_all" $(MAKE) $(AM_MAKEFLAGS) dev
+
 dev: all
 	@echo "This command is intended for developers to use;"
 	@echo "it creates development ini files as well as a"

http://git-wip-us.apache.org/repos/asf/couchdb/blob/9a805b11/src/couchdb/Makefile.am
----------------------------------------------------------------------
diff --git a/src/couchdb/Makefile.am b/src/couchdb/Makefile.am
index 5705976..de5f33f 100644
--- a/src/couchdb/Makefile.am
+++ b/src/couchdb/Makefile.am
@@ -192,5 +192,5 @@ endif
 # $(ERL) -noshell -run edoc_run files [\"$<\"]
 
 %.beam: %.erl couch_db.hrl couch_js_functions.hrl
-	$(ERLC) $(ERLC_FLAGS) ${TEST} $<;
+	$(ERLC) $(ERLC_FLAGS) $(ERLC_FLAGS_EXT) ${TEST} $<;