couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woh...@apache.org
Subject [1/2] couch commit: updated refs/heads/master to 0330583
Date Wed, 13 Jul 2016 19:58:13 GMT
Repository: couchdb-couch
Updated Branches:
  refs/heads/master fc4e64d84 -> 0330583e3


Skip couchdb_os_daemons_tests on Windows


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

Branch: refs/heads/master
Commit: 0c012f843c1e0de09beca23cf3f16007ca01979b
Parents: fc4e64d
Author: Joan Touzet <wohali@atypical.net>
Authored: Wed Jul 13 03:52:03 2016 -0400
Committer: Joan Touzet <wohali@atypical.net>
Committed: Wed Jul 13 03:52:03 2016 -0400

----------------------------------------------------------------------
 .gitignore                        | 2 ++
 rebar.config                      | 1 +
 test/couchdb_os_daemons_tests.erl | 6 ++++++
 3 files changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/0c012f84/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index c1a4701..30aa173 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,8 @@ priv/couchjs
 priv/couchspawnkillable
 priv/*.exp
 priv/*.lib
+priv/*.dll
+priv/*.exe
 vc120.pdb
 
 .rebar/

http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/0c012f84/rebar.config
----------------------------------------------------------------------
diff --git a/rebar.config b/rebar.config
new file mode 100644
index 0000000..202a563
--- /dev/null
+++ b/rebar.config
@@ -0,0 +1 @@
+{eunit_compile_opts, [{platform_define, "win32", 'WINDOWS'}]}.

http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/0c012f84/test/couchdb_os_daemons_tests.erl
----------------------------------------------------------------------
diff --git a/test/couchdb_os_daemons_tests.erl b/test/couchdb_os_daemons_tests.erl
index dd6591e..38532f2 100644
--- a/test/couchdb_os_daemons_tests.erl
+++ b/test/couchdb_os_daemons_tests.erl
@@ -12,6 +12,12 @@
 
 -module(couchdb_os_daemons_tests).
 
+%% tests are UNIX-specific, will not function under Windows
+-ifdef(WINDOWS).
+-undef(TEST).
+-define(NOTEST, 1).
+-endif.
+
 -include_lib("couch/include/couch_eunit.hrl").
 
 %% keep in sync with couchdb/couch_os_daemons.erl


Mime
View raw message