Merge pull request #267 from basho/develop-3.0-292

Develop 3.0 292

Author: martinsumner

.gitignore

@@ -12,3 +12,4 @@ _build/*
 /.eqc-info
 /current_counterexample.eqc
 .pulse
+rebar.lock

.travis.yml

@@ -1,9 +1,8 @@
 language: erlang
 otp_release:
   - 20.3.8
+  - 21.3
+  - 22.3
 script:
   - chmod u+x rebar3
-  - ./rebar3 do upgrade, compile, dialyzer, xref, eunit
-notifications:
-  slack:
-    secure: SE0EMU9HenZlLBuNg7l6WLMxJPkfyAEGgodvAqMEuQmICtrh1nV019D/A8ykejYYPPsJafWVOfypOSDrSHCndzXvEZvU8l45nJ6XLdUdrDYEmvcSqN3EqmVSsuf9H3g99bvKygXaY27MkTS5ixLil7PzybG+YpwMnQGcQxYo5Eg=
+  - ./rebar3 do upgrade, compile, xref, dialyzer, eunit

rebar.config

@@ -1,5 +1,6 @@
 {erl_opts, [debug_info, warn_untyped_record,
-            {platform_define, "^[0-9]+", namespaced_types}]}.
+            {platform_define, "^[0-9]+", namespaced_types},
+            {platform_define, "^[2-9][1-9]\..*", dirty_file_nif}]}.
 {port_specs, [{"priv/bitcask.so", ["c_src/*.c"]}]}.
 
 {port_env,
@@ -30,7 +31,7 @@
    [
     {deps,
      [meck,
-     {cuttlefish, {git, "https://github.com/basho/cuttlefish.git", {branch, "rebar3"}}}
+     {cuttlefish, {git, "https://github.com/basho/cuttlefish.git", {branch, "develop-3.0"}}}
      ]},
     {eunit_opts, [verbose]}
    ]},
@@ -53,7 +54,7 @@
    ]}
  ]}.
 
-{plugins, [pc, {rebar3_eqc, {git, "https://github.com/Vagabond/rebar3-eqc-plugin", {branch, "master"}}}]}.
+{plugins, [pc, {eqc_rebar, {git, "https://github.com/Quviq/eqc-rebar", {branch, "master"}}}]}.
 
 {provider_hooks,
  [

rebar3

@@ -3073,6 +3073,11 @@ corrupt_file(Path, Offset, Data) ->
 
 % Verify that if the cached efile port goes away, we can recover
 % and not get stuck opening casks
+
+-ifdef(dirty_file_nif).
+efile_error_test() ->
+    ok.
+-else.
 efile_error_test() ->
     Dir = setup_testfolder("bc.efile.error"),
     B = bitcask:open(Dir, [read_write]),
@@ -3089,6 +3094,8 @@ efile_error_test() ->
         B2 when is_reference(B2) ->
             ok = bitcask:close(B2)
     end.
+-endif.
+
 
 %% About leak_t0():
 %%

src/bitcask.erl

@@ -837,6 +837,10 @@ ensure_dir(F) ->
             end
     end.
 
+-ifdef(dirty_file_nif).
+list_dir(Dir) ->
+    file:list_dir(Dir).
+-else.
 list_dir(Dir) ->
     list_dir(Dir, 1).
 
@@ -881,3 +885,4 @@ prim_file_drv_open(Driver, Portopts) ->
             {error, Reason}
     end.
 
+-endif.