Skip to content

Merge upstream#3

Open
kesslerm wants to merge 78 commits into
basho:masterfrom
kesslerm:fix/merge-upstream
Open

Merge upstream#3
kesslerm wants to merge 78 commits into
basho:masterfrom
kesslerm:fix/merge-upstream

Conversation

@kesslerm
Copy link
Copy Markdown

Avoid the basho fork drifting too far from upstream project.

Upstream has important OTP-17+ compatibility fixes.

myers and others added 30 commits May 3, 2014 07:20
Add Erlang 17.0 to the test matrix
…g the execution of tests when using erlang.mk and meck as a test dependency.
…m.make.all

Removed test and doc from target all in Makefile
Full version:
rebar 2.5.1 R15B03 20141014_122343 git 2.5.1-19-g9c7dae7
This prevents warnings about unknown functions in the erlang module.
Running tests was removed from make target all in
eproxus@30a116a7
Meck used to have 'namespaced_dict' while Hamcrest recently introduced
a similar macro, 'namespaced_types' for the same purpose.
In OTP 18.0 the affected non-namespaced types were completely removed and
using them results in a compile error instead of deprecation wagning in 17.
So hamcrest.hrl relies on the precense of 'namespaced_types' macro
to use the right type. Meck's test module meck_tests.erl includes this header
so the 'namespaced_types' macro also have to be defined in meck's test.config.
To eliminate duplication I chose to unite the above two macros and
use the more generic 'namespaced_types' name.
In order to avoid creating temporary files meck_cover needs direct
access to some unexported functions of cover.
In OTP 18.0 the internal API of cover changed a bit and
compile_beam/2 (which allows passing a binary instead just a filename)
was replaced by compile_beams/1.

See erlang/otp@ab435488
soranoba and others added 29 commits September 7, 2015 15:44
Filter out optional_callbacks attributes
'Problematic modules' list now includes global
Update 'problematic modules list'
The expectations are merged for the function/arity instead of replacing
the existing one
This includes cover, which Meck assumes exists on the path.
This will avoid dependencies on the macro for newer Erlang versions, and
only use it for legacy compilations
Why is there no list of supported Erlang versions on Travis?!
Fix eunit compile failure on Erlang 17+ (hamcrest)
@hazen
Copy link
Copy Markdown

hazen commented Oct 11, 2016

Thanks for doing this @kesslerm!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.