couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kxe...@apache.org
Subject [03/36] couchdb commit: updated refs/heads/1963-eunit to 85f2750
Date Tue, 03 Jun 2014 15:54:41 GMT
Add common header for eunit test files


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

Branch: refs/heads/1963-eunit
Commit: 9427d69070f7ce5af1e01c7f914a9a05aefcc002
Parents: 2652d1e
Author: Alexander Shorin <kxepal@apache.org>
Authored: Fri May 16 03:46:16 2014 +0400
Committer: Alexander Shorin <kxepal@apache.org>
Committed: Tue Jun 3 02:16:40 2014 +0400

----------------------------------------------------------------------
 .gitignore                        |  1 +
 configure.ac                      |  1 +
 test/couchdb/Makefile.am          |  6 +++++-
 test/couchdb/couchdb_tests.hrl.in | 23 +++++++++++++++++++++++
 4 files changed, 30 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/9427d690/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 85e2365..80b1ae0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -129,6 +129,7 @@ stamp-h1
 test/.deps/
 test/bench/run
 test/couchdb/run
+test/couchdb/couchdb_tests.hrl
 test/etap/.deps/
 test/etap/run
 test/etap/temp.*

http://git-wip-us.apache.org/repos/asf/couchdb/blob/9427d690/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 4b34811..4d45a97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -755,6 +755,7 @@ AC_CONFIG_FILES([test/Makefile])
 AC_CONFIG_FILES([test/bench/Makefile])
 AC_CONFIG_FILES([test/couchdb/run])
 AC_CONFIG_FILES([test/couchdb/Makefile])
+AC_CONFIG_FILES([test/couchdb/couchdb_tests.hrl])
 AC_CONFIG_FILES([test/etap/Makefile])
 AC_CONFIG_FILES([test/etap/test_util.erl])
 AC_CONFIG_FILES([test/javascript/Makefile])

http://git-wip-us.apache.org/repos/asf/couchdb/blob/9427d690/test/couchdb/Makefile.am
----------------------------------------------------------------------
diff --git a/test/couchdb/Makefile.am b/test/couchdb/Makefile.am
index 5bd65dd..fac5648 100644
--- a/test/couchdb/Makefile.am
+++ b/test/couchdb/Makefile.am
@@ -16,8 +16,12 @@ all:
 	mkdir -p {ebin,temp}
 	chmod +x run
 
+eunit_files = \
+    couchdb_tests.hrl
+
 EXTRA_DIST = \
-    run.in
+    run.in \
+    $(eunit_files)
 
 clean-local:
 	rm -rf ebin

http://git-wip-us.apache.org/repos/asf/couchdb/blob/9427d690/test/couchdb/couchdb_tests.hrl.in
----------------------------------------------------------------------
diff --git a/test/couchdb/couchdb_tests.hrl.in b/test/couchdb/couchdb_tests.hrl.in
new file mode 100644
index 0000000..c749f3a
--- /dev/null
+++ b/test/couchdb/couchdb_tests.hrl.in
@@ -0,0 +1,23 @@
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
+-include_lib("eunit/include/eunit.hrl").
+
+-define(BUILDDIR, "@abs_top_builddir@").
+-define(SOURCEDIR, "@abs_top_srcdir@").
+-define(CONFIG_CHAIN, [
+    filename:join([?BUILDDIR, "etc", "couchdb", "default_dev.ini"]),
+    filename:join([?SOURCEDIR, "test", "random_port.ini"]),
+    filename:join([?BUILDDIR, "etc", "couchdb", "local_dev.ini"])]).
+-define(TEMPDIR,
+    filename:join([?SOURCEDIR, "test", "couchdb", "temp"])).
+


Mime
View raw message