Merge pull request #106 from basho/bug/rdb/orswo-eqc-cond-comp

orswot_eqc.erl causes riak_dt tests to appear to fail Reviewed-by: seancribbs
basho · Oct 3, 2014 · 7cc6a7d · 7cc6a7d
2 parents c06820d + 270c7eb
commit 7cc6a7d
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/test/orswot_eqc.erl b/test/orswot_eqc.erl
@@ -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").
@@ -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.