Skip to content

Commit

Permalink
orswot_eqc.erl causes riak_dt tests to appear to fail
Browse files Browse the repository at this point in the history 
If you don't have EQC installed, orswot_eqc won't compile, which
looks bad. If def out that eqc stuff.
  • Loading branch information
@russelldb
russelldb committed Oct 3, 2014
1 parent c06820d commit 270c7eb
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions test/orswot_eqc.erl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

-module(orswot_eqc).

-ifdef(EQC).
-include_lib("eqc/include/eqc.hrl").
-include_lib("eqc/include/eqc_statem.hrl").
-include_lib("eunit/include/eunit.hrl").
Expand Down Expand Up @@ -469,3 +470,5 @@ model_merge({S1, D1}, {S2, D2}) ->
S = riak_dt_orset:merge(S1, S2),
D = riak_dt_orset:merge(D1, D2),
model_apply_deferred(S, D).

-endif.

4 comments on commit 270c7eb

@borshop
Copy link
Contributor

@borshop borshop commented on 270c7eb Oct 3, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from seancribbs
at 270c7eb

@borshop
Copy link
Contributor

@borshop borshop commented on 270c7eb Oct 3, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

basho/riak_dt/bug/rdb/orswo-eqc-cond-comp = 270c7eb merged ok, testing candidate = 7cc6a7d

@borshop
Copy link
Contributor

@borshop borshop commented on 270c7eb Oct 3, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging basho/riak_dt/bug/rdb/orswo-eqc-cond-comp = 270c7eb into borshop-integration-106-bug/rdb/orswo-eqc-cond-comp

@borshop
Copy link
Contributor

@borshop borshop commented on 270c7eb Oct 3, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all tests pass:
success: http://buildbot.bos1/builders/test-riak_dt/builds/80

Please sign in to comment.