Skip to content

Commit

Permalink
Update etap and remove obsolete files
Browse files Browse the repository at this point in the history
Update tests to use new etap, removed unused variable warnings, and
added a check-etap to the Makefile as a convenience
  • Loading branch information
bitdiddle authored and Bob Dionne committed Apr 26, 2012
1 parent c2b1249 commit eb3d5d8
Show file tree
Hide file tree
Showing 21 changed files with 278 additions and 903 deletions.
3 changes: 3 additions & 0 deletions Makefile.am
Expand Up @@ -89,6 +89,9 @@ if USE_CURL
$(top_builddir)/test/javascript/run
endif

check-etap: dev
$(top_builddir)/test/etap/run $(top_srcdir)/test/etap

cover: dev
rm -f cover/*.coverdata
COVER=1 COVER_BIN=./src/couchdb/ $(top_builddir)/test/etap/run
Expand Down
2 changes: 1 addition & 1 deletion src/couch_mrview/test/01-load.t
Expand Up @@ -29,6 +29,6 @@ main(_) ->
etap:plan(length(Modules)),
lists:foreach(
fun(Module) ->
etap_can:loaded_ok(Module, lists:concat(["Loaded: ", Module]))
etap:loaded_ok(Module, lists:concat(["Loaded: ", Module]))
end, Modules),
etap:end_tests().
2 changes: 1 addition & 1 deletion src/couch_replicator/test/01-load.t
Expand Up @@ -32,6 +32,6 @@ main(_) ->
etap:plan(length(Modules)),
lists:foreach(
fun(Module) ->
etap_can:loaded_ok(Module, lists:concat(["Loaded: ", Module]))
etap:loaded_ok(Module, lists:concat(["Loaded: ", Module]))
end, Modules),
etap:end_tests().
20 changes: 2 additions & 18 deletions src/etap/Makefile.am
Expand Up @@ -13,26 +13,10 @@
etapebindir = $(localerlanglibdir)/etap/ebin

etap_file_collection = \
etap.erl \
etap_application.erl \
etap_can.erl \
etap_exception.erl \
etap_process.erl \
etap_report.erl \
etap_request.erl \
etap_string.erl \
etap_web.erl
etap.erl

etapebin_make_generated_file_list = \
etap.beam \
etap_application.beam \
etap_can.beam \
etap_exception.beam \
etap_process.beam \
etap_report.beam \
etap_request.beam \
etap_string.beam \
etap_web.beam
etap.beam

etapebin_DATA = $(etapebin_make_generated_file_list)

Expand Down

0 comments on commit eb3d5d8

Please sign in to comment.