Updating various version control properties

Ignoring coverage and test output.
Making test files executable to be run individually.



git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@780338 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 14 insertions, 5 deletions

diff --git a/.gitignore b/.gitignore
index 9b0c4ed5..f3bef64c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,3 +62,11 @@ etc/couchdb/default_dev.ini
 etc/couchdb/local_dev.ini
 utils/run
 tmp
+
+# for make check
+
+test/etap/temp.*
+
+# for make cover
+
+cover/*
diff --git a/test/etap/001-load.t b/test/etap/001-load.t
index 527ba8f6..527ba8f6 100644..100755
--- a/test/etap/001-load.t
+++ b/test/etap/001-load.t
diff --git a/test/etap/010-file-basics.t b/test/etap/010-file-basics.t
index 73ff5d8a..af9601d8 100644..100755
--- a/test/etap/010-file-basics.t
+++ b/test/etap/010-file-basics.t
@@ -2,7 +2,7 @@
 %% -*- erlang -*-
 %%! -pa ./src/couchdb -sasl errlog_type error -boot start_sasl -noshell
 
--define(FILE_NAME, "./t/temp.010").
+-define(FILE_NAME, "./test/etap/temp.010").
 
 main(_) ->
     etap:plan(16),
diff --git a/test/etap/011-file-headers.t b/test/etap/011-file-headers.t
index 2fc18ed1..51e7fa70 100644..100755
--- a/test/etap/011-file-headers.t
+++ b/test/etap/011-file-headers.t
@@ -2,7 +2,7 @@
 %% -*- erlang -*-
 %%! -pa ./src/couchdb -sasl errlog_type error -boot start_sasl -noshell
 
--define(FILE_NAME, "./t/temp.011").
+-define(FILE_NAME, "./test/etap/temp.011").
 -define(SIZE_BLOCK, 4096). % Need to keep this in sync with couch_file.erl
 
 main(_) ->
diff --git a/test/etap/020-btree-basics.t b/test/etap/020-btree-basics.t
index 7f7820ab..682fd229 100644..100755
--- a/test/etap/020-btree-basics.t
+++ b/test/etap/020-btree-basics.t
@@ -2,7 +2,8 @@
 %% -*- erlang -*-
 %%! -pa ./src/couchdb -sasl errlog_type error -boot start_sasl -noshell
 
--define(FILE_NAME, "./t/temp.020").
+-define(FILE_NAME, "./test/etap/temp.020").
+-define(ROWS, 250).
 
 -record(btree, {fd, root, extract_kv, assemble_kv, less, reduce}).
 
@@ -21,7 +22,7 @@ main(_) ->
 %% broken into multiple nodes. AKA "How do we appropiately detect if multiple
 %% nodes were created."
 test()->
-    Sorted = [{Seq, random:uniform()} || Seq <- lists:seq(1, 1000)],
+    Sorted = [{Seq, random:uniform()} || Seq <- lists:seq(1, ?ROWS)],
     etap:ok(test_kvs(Sorted), "Testing sorted keys"),
     etap:ok(test_kvs(lists:reverse(Sorted)), "Testing reversed sorted keys"),
     etap:ok(test_kvs(shuffle(Sorted)), "Testing shuffled keys."),
diff --git a/test/etap/021-btree-reductions.t b/test/etap/021-btree-reductions.t
index df418a56..04c175e9 100644..100755
--- a/test/etap/021-btree-reductions.t
+++ b/test/etap/021-btree-reductions.t
@@ -2,7 +2,7 @@
 %% -*- erlang -*-
 %%! -pa ./src/couchdb -sasl errlog_type error -boot start_sasl -noshell
 
--define(FILE_NAME, "./t/temp.021").
+-define(FILE_NAME, "./test/etap/temp.021").
 -define(ROWS, 1000).
 
 main(_) ->
diff --git a/test/etap/030-doc-from-json.t b/test/etap/030-doc-from-json.t
index 2d5eb8f7..2d5eb8f7 100644..100755
--- a/test/etap/030-doc-from-json.t
+++ b/test/etap/030-doc-from-json.t
diff --git a/test/etap/031-doc-to-json.t b/test/etap/031-doc-to-json.t
index f444ec6e..f444ec6e 100644..100755
--- a/test/etap/031-doc-to-json.t
+++ b/test/etap/031-doc-to-json.t