[couchdb-ioq] branch optional-proper updated (fb2f635 -> b8990c6)

[rn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rnewson pushed a change to branch optional-proper
in repository https://gitbox.apache.org/repos/asf/couchdb-ioq.git.


 discard fb2f635  Make PropEr an optional (test) dependency
     new b8990c6  Make PropEr an optional (test) dependency

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (fb2f635)
            \
             N -- N -- N   refs/heads/optional-proper (b8990c6)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 rebar.config        |  7 -------
 rebar.config.script | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 7 deletions(-)
 delete mode 100644 rebar.config
 create mode 100644 rebar.config.script

[couchdb-ioq] 01/01: Make PropEr an optional (test) dependency

[rn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rnewson pushed a commit to branch optional-proper
in repository https://gitbox.apache.org/repos/asf/couchdb-ioq.git

commit b8990c6638549bf83418e9543afd004a0664d4a5
Author: Robert Newson <rn...@apache.org>
AuthorDate: Thu Feb 28 14:07:13 2019 +0000

    Make PropEr an optional (test) dependency
---
 rebar.config          | 11 -----------
 rebar.config.script   | 18 ++++++++++++++++++
 test/ioq_kv_tests.erl |  2 ++
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/rebar.config b/rebar.config
deleted file mode 100644
index b25fdb5..0000000
--- a/rebar.config
+++ /dev/null
@@ -1,11 +0,0 @@
-{deps, [
-    {proper, ".*", {git, "https://github.com/manopapad/proper.git", "master"}}
-]}.
-
-{eunit_opts, [
-    verbose,
-    {report, {
-        eunit_surefire, [{dir,"."}]
-    }}
-]}.
-
diff --git a/rebar.config.script b/rebar.config.script
new file mode 100644
index 0000000..fca40b8
--- /dev/null
+++ b/rebar.config.script
@@ -0,0 +1,18 @@
+WithProper = code:lib_dir(proper) /= {error, bad_name}.
+
+
+ErlOpts =
+    case WithProper of
+        true ->
+            [{d, 'WITH_PROPER'}];
+        false ->
+            []
+    end,
+
+{eunit_opts, [
+    verbose,
+    {report, {
+        eunit_surefire, [{dir,"."}]
+    }}
+],
+{erl_opts, ErlOpts}}.
diff --git a/test/ioq_kv_tests.erl b/test/ioq_kv_tests.erl
index 3c34573..48ee464 100644
--- a/test/ioq_kv_tests.erl
+++ b/test/ioq_kv_tests.erl
@@ -11,6 +11,7 @@
 % the License.
 
 -module(ioq_kv_tests).
+-ifdef(WITH_PROPER).
 -behaviour(proper_statem).
 
 -include_lib("proper/include/proper.hrl").
@@ -147,3 +148,4 @@ almost_any() ->
         ?LAZY(loose_tuple(almost_any())),
         ?LAZY(list(almost_any()))
     ]).
+-endif.