src/etap/Makefile.am src/etap/etap.erl src/etap/etap_application.erl src/etap/etap_can.erl src/etap/etap_exception.erl src/etap/etap_process.erl src/etap/etap_report.erl src/etap/etap_request.erl src/etap/etap_string.erl src/etap/etap_web.erl @@ -343,3 +343,29 @@ For the src/erlang-oauth component: WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +For the src/etap component: + + Copyright (c) 2008-2009 Nick Gerakines <nick@gerakines.net> + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following + conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + LICENSE @@ -10,7 +10,7 @@ ## License for the specific language governing permissions and limitations under ## the License. -SUBDIRS = bin etc src/couchdb src/erlang-oauth src/ibrowse src/mochiweb share test var utils +SUBDIRS = bin etc src/couchdb src/erlang-oauth src/etap src/ibrowse src/mochiweb share test var utils localdoc_DATA = AUTHORS.gz BUGS.gz CHANGES.gz NEWS.gz README.gz THANKS.gz @@ -43,7 +43,9 @@ cover: dev rm -f cover/*.coverdata COVER=1 COVER_BIN=./src/couchdb/ prove test/etap/*.t SRC=./src/couchdb/ \ - $(ERL) -noshell -eval 'etap_report:create()' \ + $(ERL) -noshell \ + -pa src/etap \ + -eval 'etap_report:create()' \ -s init stop > /dev/null 2>&1 dev: all Makefile.am @@ -34,6 +34,10 @@ This product also includes the following third-party components: Copyright 2009, Tim Fletcher <http://tfletcher.com/> + * ETap (http://github.com/ngerakines/etap/) + + Copyright 2009, Nick Gerakines <nick@gerakines.net> + * mimeparse.js (http://code.google.com/p/mimeparse/) Copyright 2009, Chris Anderson <jchris@apache.org> NOTICE @@ -346,6 +346,7 @@ AC_CONFIG_FILES([src/couchdb/couch.app.tpl]) AC_CONFIG_FILES([src/couchdb/Makefile]) AC_CONFIG_FILES([src/couchdb/priv/Makefile]) AC_CONFIG_FILES([src/erlang-oauth/Makefile]) +AC_CONFIG_FILES([src/etap/Makefile]) AC_CONFIG_FILES([src/ibrowse/Makefile]) AC_CONFIG_FILES([src/mochiweb/Makefile]) AC_CONFIG_FILES([test/Makefile]) configure.ac @@ -62,6 +62,7 @@ ^src/couchdb/priv/Makefile.in ^src/couchdb/priv/couchspawnkillable ^src/erlang-oauth/* +^src/etap/* ^src/ibrowse/* ^src/mochiweb/* ^stamp-h1 license.skip @@ -17,6 +17,7 @@ % Test that we can load each module. main(_) -> + code:add_patha("src/etap"), code:add_pathz("src/couchdb"), etap:plan(39), Modules = [ test/etap/001-load.t @@ -13,6 +13,7 @@ main(_) -> + code:add_patha("src/etap"), code:add_pathz("src/couchdb"), etap:plan(3), etap:is( test/etap/002-erl-driver.t @@ -15,6 +15,7 @@ filename() -> "./test/etap/temp.010". main(_) -> + code:add_patha("src/etap"), code:add_pathz("src/couchdb"), etap:plan(16), case (catch test()) of test/etap/010-file-basics.t @@ -18,6 +18,7 @@ filename() -> "./test/etap/temp.011". sizeblock() -> 4096. % Need to keep this in sync with couch_file.erl main(_) -> + code:add_patha("src/etap"), code:add_pathz("src/couchdb"), {S1, S2, S3} = now(), random:seed(S1, S2, S3), test/etap/011-file-headers.t @@ -20,6 +20,7 @@ rows() -> 250. -record(btree, {fd, root, extract_kv, assemble_kv, less, reduce}). main(_) -> + code:add_patha("src/etap"), code:add_pathz("src/couchdb"), etap:plan(48), case (catch test()) of test/etap/020-btree-basics.t @@ -18,6 +18,7 @@ filename() -> "./test/etap/temp.021". rows() -> 1000. main(_) -> + code:add_patha("src/etap"), code:add_pathz("src/couchdb"), etap:plan(8), case (catch test()) of test/etap/021-btree-reductions.t @@ -20,6 +20,7 @@ -record(att, {name, type, len, md5= <<>>, revpos=0, data}). main(_) -> + code:add_patha("src/etap"), code:add_pathz("src/couchdb"), etap:plan(26), case (catch test()) of test/etap/030-doc-from-json.t @@ -20,6 +20,7 @@ -record(att, {name, type, len, md5= <<>>, revpos=0, data}). main(_) -> + code:add_patha("src/etap"), code:add_pathz("src/couchdb"), etap:plan(12), case (catch test()) of test/etap/031-doc-to-json.t @@ -14,6 +14,7 @@ % the License. main(_) -> + code:add_patha("src/etap"), code:add_pathz("src/couchdb"), application:start(crypto), test/etap/040-util.t @@ -38,6 +38,7 @@ run_test(IniFiles, Test) -> end. main(_) -> + code:add_patha("src/etap"), code:add_pathz("src/couchdb"), application:start(crypto), etap:plan(unknown), test/etap/041-uuid-gen.t @@ -14,6 +14,7 @@ % the License. main(_) -> + code:add_patha("src/etap"), code:add_pathz("src/couchdb"), etap:plan(13), case (catch test()) of test/etap/050-stream.t @@ -14,6 +14,7 @@ % the License. main(_) -> + code:add_patha("src/etap"), code:add_pathz("src/couchdb"), etap:plan(16), case (catch test()) of test/etap/060-kt-merging.t @@ -14,6 +14,7 @@ % the License. main(_) -> + code:add_patha("src/etap"), code:add_pathz("src/couchdb"), etap:plan(4), case (catch test()) of test/etap/061-kt-missing-leaves.t @@ -14,6 +14,7 @@ % the License. main(_) -> + code:add_patha("src/etap"), code:add_pathz("src/couchdb"), etap:plan(6), case (catch test()) of test/etap/062-kt-remove-leaves.t @@ -14,6 +14,7 @@ % the License. main(_) -> + code:add_patha("src/etap"), code:add_pathz("src/couchdb"), etap:plan(11), case (catch test()) of test/etap/063-kt-get-leaves.t @@ -14,6 +14,7 @@ % the License. main(_) -> + code:add_patha("src/etap"), code:add_pathz("src/couchdb"), etap:plan(4), case (catch test()) of test/etap/064-kt-counting.t @@ -14,6 +14,7 @@ % the License. main(_) -> + code:add_patha("src/etap"), code:add_pathz("src/couchdb"), etap:plan(3), case (catch test()) of test/etap/065-kt-stemming.t @@ -14,6 +14,7 @@ % the License. main(_) -> + code:add_patha("src/etap"), code:add_pathz("src/couchdb"), code:add_pathz("src/mochiweb"), test/etap/070-couch-db.t @@ -17,6 +17,7 @@ default_config() -> "etc/couchdb/default_dev.ini". main(_) -> + code:add_patha("src/etap"), code:add_pathz("src/couchdb"), etap:plan(12), case (catch test()) of test/etap/080-config-get-set.t @@ -39,6 +39,7 @@ run_tests(IniFiles, Tests) -> end. main(_) -> + code:add_patha("src/etap"), code:add_pathz("src/couchdb"), etap:plan(17), test/etap/081-config-override.t @@ -17,6 +17,7 @@ default_config() -> "etc/couchdb/default_dev.ini". main(_) -> + code:add_patha("src/etap"), code:add_pathz("src/couchdb"), etap:plan(5), case (catch test()) of test/etap/082-config-register.t @@ -17,6 +17,7 @@ default_config() -> "etc/couchdb/default_dev.ini". main(_) -> + code:add_patha("src/etap"), code:add_pathz("src/couchdb"), etap:plan(3), case (catch test()) of test/etap/083-config-no-files.t @@ -14,6 +14,7 @@ % the License. main(_) -> + code:add_patha("src/etap"), code:add_pathz("src/couchdb"), etap:plan(16), case (catch test()) of test/etap/090-task-status.t @@ -14,6 +14,7 @@ % the License. main(_) -> + code:add_patha("src/etap"), code:add_pathz("src/couchdb"), etap:plan(8), case (catch test()) of test/etap/100-ref-counter.t @@ -39,6 +39,7 @@ server() -> "http://127.0.0.1:5984/". dbname() -> "etap-test-db". main(_) -> + code:add_patha("src/etap"), code:add_pathz("src/couchdb"), code:add_pathz("src/ibrowse"), code:add_pathz("src/mochiweb"), test/etap/110-replication-httpc.t @@ -38,6 +38,7 @@ conn = nil }). main(_) -> + code:add_patha("src/etap"), code:add_pathz("src/couchdb"), code:add_pathz("src/ibrowse"), code:add_pathz("src/mochiweb"), test/etap/111-replication-changes-feed.t @@ -40,6 +40,7 @@ }). main(_) -> + code:add_patha("src/etap"), code:add_pathz("src/couchdb"), code:add_pathz("src/ibrowse"), code:add_pathz("src/mochiweb"), test/etap/112-replication-missing-revs.t @@ -14,6 +14,7 @@ % the License. main(_) -> + code:add_patha("src/etap"), code:add_pathz("src/couchdb"), etap:plan(11), case (catch test()) of test/etap/120-stats-collect.t @@ -14,6 +14,7 @@ % the License. main(_) -> + code:add_patha("src/etap"), code:add_pathz("src/couchdb"), etap:plan(unknown), case (catch test()) of test/etap/121-stats-aggregates.t 5faad6c14569616482722c7502cd1cbdad3f9205 davisp davisp@13f79535-47bb-0310-9956-ffa450edef68 http://github.com/halorgium/couchdb/commit/65bb7da4d1a9bb21ccc060bb51765c227377b919 65bb7da4d1a9bb21ccc060bb51765c227377b919 2009-09-28T19:38:18-07:00 2009-09-28T19:38:18-07:00 Add ETap to CouchDB's SVN repository. This pulls in ETap as an included dependency. As per directions of the ASF the NOTICE and LICENSE have been updated. Tests have been updated to include etap on Erlang's code path. license.skip was updated for make distcheck. This only affects running the Erlang test suite. Noah is awesome. git-svn-id: http://svn.apache.org/repos/asf/couchdb/trunk@819799 13f79535-47bb-0310-9956-ffa450edef68 59bf3af8ae1b074edf286b541eb2cfc550122a0b davisp davisp@13f79535-47bb-0310-9956-ffa450edef68