From e29a1924afe9e6051369f7bcbf44ccdf53de536a Mon Sep 17 00:00:00 2001 From: Paul Joseph Davis Date: Mon, 9 Nov 2009 00:39:16 +0000 Subject: Fixes 'make distcheck' to run the test suite. Quite a few changes to the build system to handle VPATH builds appropriately as well as make the test suite know about them. git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@833951 13f79535-47bb-0310-9956-ffa450edef68 --- src/couchdb/priv/Makefile.am | 9 +++++++- src/couchdb/priv/stat_descriptions.cfg | 37 ------------------------------- src/couchdb/priv/stat_descriptions.cfg.in | 37 +++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 38 deletions(-) delete mode 100644 src/couchdb/priv/stat_descriptions.cfg create mode 100644 src/couchdb/priv/stat_descriptions.cfg.in (limited to 'src/couchdb/priv') diff --git a/src/couchdb/priv/Makefile.am b/src/couchdb/priv/Makefile.am index 8c504dbc..fecaa64b 100644 --- a/src/couchdb/priv/Makefile.am +++ b/src/couchdb/priv/Makefile.am @@ -13,11 +13,18 @@ couchlibdir = $(localerlanglibdir)/couch-$(version) couchprivdir = $(couchlibdir)/priv -EXTRA_DIST = couchspawnkillable.sh stat_descriptions.cfg +EXTRA_DIST = \ + couchspawnkillable.sh \ + stat_descriptions.cfg.in + +CLEANFILES = stat_descriptions.cfg couchpriv_DATA = stat_descriptions.cfg couchpriv_PROGRAMS = couchspawnkillable +%.cfg: %.cfg.in + cp $< $@ + if WINDOWS couchspawnkillable_SOURCES = couchspawnkillable_win.c endif diff --git a/src/couchdb/priv/stat_descriptions.cfg b/src/couchdb/priv/stat_descriptions.cfg deleted file mode 100644 index 91a1540f..00000000 --- a/src/couchdb/priv/stat_descriptions.cfg +++ /dev/null @@ -1,37 +0,0 @@ -% Style guide for descriptions: Start with a lowercase letter & do not add -% a trailing full-stop / period -% Please keep this in alphabetical order - -{couchdb, database_writes, "number of times a database was change"}. -{couchdb, database_reads, "number of times a document was read from a databas"}. -{couchdb, open_databases, "number of open database"}. -{couchdb, open_os_files, "number of file descriptors CouchDB has ope"}. -{couchdb, request_time, "length of a request inside CouchDB without MochiWe"}. - -{httpd, bulk_requests, "number of bulk request"}. -{httpd, requests, "number of HTTP request"}. -{httpd, temporary_view_reads, "number of temporary view read"}. -{httpd, view_reads, "number of view read"}. -{httpd, clients_requesting_changes, "number of clients for continuous _change"}. - -{httpd_request_methods, 'COPY', "number of HTTP COPY request"}. -{httpd_request_methods, 'DELETE', "number of HTTP DELETE request"}. -{httpd_request_methods, 'GET', "number of HTTP GET request"}. -{httpd_request_methods, 'HEAD', "number of HTTP HEAD request"}. -{httpd_request_methods, 'MOVE', "number of HTTP MOVE request"}. -{httpd_request_methods, 'POST', "number of HTTP POST request"}. -{httpd_request_methods, 'PUT', "number of HTTP PUT request"}. - -{httpd_status_codes, '200', "number of HTTP 200 OK response"}. -{httpd_status_codes, '201', "number of HTTP 201 Created response"}. -{httpd_status_codes, '202', "number of HTTP 202 Accepted response"}. -{httpd_status_codes, '301', "number of HTTP 301 Moved Permanently response"}. -{httpd_status_codes, '304', "number of HTTP 304 Not Modified response"}. -{httpd_status_codes, '400', "number of HTTP 400 Bad Request response"}. -{httpd_status_codes, '401', "number of HTTP 401 Unauthorized response"}. -{httpd_status_codes, '403', "number of HTTP 403 Forbidden response"}. -{httpd_status_codes, '404', "number of HTTP 404 Not Found response"}. -{httpd_status_codes, '405', "number of HTTP 405 Method Not Allowed response"}. -{httpd_status_codes, '409', "number of HTTP 409 Conflict response"}. -{httpd_status_codes, '412', "number of HTTP 412 Precondition Failed response"}. -{httpd_status_codes, '500', "number of HTTP 500 Internal Server Error response"}. diff --git a/src/couchdb/priv/stat_descriptions.cfg.in b/src/couchdb/priv/stat_descriptions.cfg.in new file mode 100644 index 00000000..91a1540f --- /dev/null +++ b/src/couchdb/priv/stat_descriptions.cfg.in @@ -0,0 +1,37 @@ +% Style guide for descriptions: Start with a lowercase letter & do not add +% a trailing full-stop / period +% Please keep this in alphabetical order + +{couchdb, database_writes, "number of times a database was change"}. +{couchdb, database_reads, "number of times a document was read from a databas"}. +{couchdb, open_databases, "number of open database"}. +{couchdb, open_os_files, "number of file descriptors CouchDB has ope"}. +{couchdb, request_time, "length of a request inside CouchDB without MochiWe"}. + +{httpd, bulk_requests, "number of bulk request"}. +{httpd, requests, "number of HTTP request"}. +{httpd, temporary_view_reads, "number of temporary view read"}. +{httpd, view_reads, "number of view read"}. +{httpd, clients_requesting_changes, "number of clients for continuous _change"}. + +{httpd_request_methods, 'COPY', "number of HTTP COPY request"}. +{httpd_request_methods, 'DELETE', "number of HTTP DELETE request"}. +{httpd_request_methods, 'GET', "number of HTTP GET request"}. +{httpd_request_methods, 'HEAD', "number of HTTP HEAD request"}. +{httpd_request_methods, 'MOVE', "number of HTTP MOVE request"}. +{httpd_request_methods, 'POST', "number of HTTP POST request"}. +{httpd_request_methods, 'PUT', "number of HTTP PUT request"}. + +{httpd_status_codes, '200', "number of HTTP 200 OK response"}. +{httpd_status_codes, '201', "number of HTTP 201 Created response"}. +{httpd_status_codes, '202', "number of HTTP 202 Accepted response"}. +{httpd_status_codes, '301', "number of HTTP 301 Moved Permanently response"}. +{httpd_status_codes, '304', "number of HTTP 304 Not Modified response"}. +{httpd_status_codes, '400', "number of HTTP 400 Bad Request response"}. +{httpd_status_codes, '401', "number of HTTP 401 Unauthorized response"}. +{httpd_status_codes, '403', "number of HTTP 403 Forbidden response"}. +{httpd_status_codes, '404', "number of HTTP 404 Not Found response"}. +{httpd_status_codes, '405', "number of HTTP 405 Method Not Allowed response"}. +{httpd_status_codes, '409', "number of HTTP 409 Conflict response"}. +{httpd_status_codes, '412', "number of HTTP 412 Precondition Failed response"}. +{httpd_status_codes, '500', "number of HTTP 500 Internal Server Error response"}. -- cgit v1.2.3