Skip to content

Commit

Permalink
OTP 19 support via compilation of CT suite. This defines namespaced_t…
Browse files Browse the repository at this point in the history
…ypes.

Disable CT auto-compile.
Fix warnings.
Update to proper v1.2
  • Loading branch information
Luke Bakken committed Jul 9, 2016
1 parent 13f9bfb commit 4eb8b81
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 5 deletions.
8 changes: 8 additions & 0 deletions .gitignore
Expand Up @@ -4,6 +4,7 @@
*.o *.o
*.so *.so
*.swp *.swp
.rebar/
build/* build/*
^build$ ^build$
Emakefile Emakefile
Expand All @@ -15,3 +16,10 @@ ebin/*.beam
logs/* logs/*
include/hamcrest.hrl include/hamcrest.hrl
qc.hrl qc.hrl
deps/
ct_*/
all_runs.html
ct_*
jquery-latest.js
jquery.tablesorter.min.js
variables-ct@localhost
16 changes: 13 additions & 3 deletions test.config
@@ -1,9 +1,19 @@

{cover_enabled, true}. {cover_enabled, true}.

{deps, [ {deps, [
%% TODO: bind to a specific commit or tag instead of 'master' {proper, "1.*", {git, "http://github.com/manopapad/proper.git", "v1.2"}}
{proper, ".*", {git, "http://github.com/manopapad/proper.git", "v1.1"}}
]}. ]}.


{erl_opts, [
debug_info,
fail_on_warning,
{src_dirs, ["test"]},
{platform_define, "^[0-9]+", namespaced_types}
]}.

{validate_app_modules, false}.

{ct_extra_params, "-no_auto_compile"}.

{plugin_dir, "priv/build/plugins"}. {plugin_dir, "priv/build/plugins"}.
{plugins, [eqc_resolver]}. {plugins, [eqc_resolver]}.
4 changes: 2 additions & 2 deletions test/hamcrest_matchers_SUITE.erl
Expand Up @@ -69,7 +69,7 @@ is_not_evaluates_to_logical_negation_of_underlying_matcher(_) ->
?EQC(P). ?EQC(P).


is_not_provides_convenient_shortcut_for_not_equal_to(_) -> is_not_provides_convenient_shortcut_for_not_equal_to(_) ->
P = ?FORALL({X, Y}, {binary(), binary()}, P = ?FORALL({X, _Y}, {binary(), binary()},
begin begin
#'hamcrest.matchspec'{matcher=F1} = equal_to(X), #'hamcrest.matchspec'{matcher=F1} = equal_to(X),
#'hamcrest.matchspec'{matcher=F2} = is_not(X), #'hamcrest.matchspec'{matcher=F2} = is_not(X),
Expand Down Expand Up @@ -240,7 +240,7 @@ ends_with_should_only_match_last_portion_of_string(_) ->
?IMPLIES(length(Xs) > 0, ?IMPLIES(length(Xs) > 0,
begin begin
Y = round(length(Xs) / 2), Y = round(length(Xs) / 2),
LStr = string:left(Xs, Y), _LStr = string:left(Xs, Y),
RStr = string:right(Xs, Y), RStr = string:right(Xs, Y),
case (assert_that(Xs, ends_with(RStr))) of case (assert_that(Xs, ends_with(RStr))) of
true -> true; true -> true;
Expand Down

0 comments on commit 4eb8b81

Please sign in to comment.