diff options
| author | Loïc Hoguin <[email protected]> | 2015-05-31 15:05:55 +0300 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2015-06-01 12:58:12 +0300 |
| commit | 2f2c1089391999a3ba5fe9aeab3ca9f43e64439b (patch) | |
| tree | 50859519db6c4deee3559b6c6260b6e2007a387a /test/Makefile | |
| parent | 56f93881b3f0db67eec6509945c532d96e292674 (diff) | |
| download | erlang.mk-2f2c1089391999a3ba5fe9aeab3ca9f43e64439b.tar.gz erlang.mk-2f2c1089391999a3ba5fe9aeab3ca9f43e64439b.tar.bz2 erlang.mk-2f2c1089391999a3ba5fe9aeab3ca9f43e64439b.zip | |
More autopatch fixes
Some projects had their modules section filled incorrectly, this
has been fixed.
Merl (used by erlydtl) had its .app file incorrectly moved to
.app.src despite having its own Makefile. This has been fixed.
A new g++ warning caused some projects with -Werror to fail to
compile, this has been fixed.
The include path given in rebar.config is now properly used.
The project concuerror has been removed temporarily due to a
recent change that broke the auto detection.
The projects ircbot, exmpp and tsung have been removed temporarily
due to broken modules section and will need a custom patch and/or
a PR sent to fix them.
Diffstat (limited to 'test/Makefile')
| -rw-r--r-- | test/Makefile | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/test/Makefile b/test/Makefile index dcc51b5..e31e531 100644 --- a/test/Makefile +++ b/test/Makefile @@ -240,25 +240,21 @@ pkg-$(1): pkg-$(1)-clean pkg-$(1)-app1 else \ if [ `find -type f -name erl_crash.dump` ]; then exit 33; fi \ fi - @if [ "$(1)" = "tsung" ]; then \ - echo "Skipping module loading check for package $(1)..."; \ - else \ - erl +A0 -noinput -boot start_clean -pa app1/deps/*/ebin -eval " \ - Apps = [list_to_atom(App) || \"app1/deps/\" ++ App <- filelib:wildcard(\"app1/deps/*\")], \ - [begin \ - io:format(\"Loading application ~p~n\", [App]), \ - case application:load(App) of \ - {error, _} -> ok; \ - ok -> \ - {ok, Mods} = application:get_key(App, modules), \ - [try io:format(\" Loading module ~p~n\", [Mod]), \ - {module, Mod} = code:load_file(Mod) \ - catch C:R -> timer:sleep(500), erlang:C(R) \ - end || Mod <- Mods] \ - end \ - end || App <- Apps], \ - halt()."; \ - fi + erl +A0 -noinput -boot start_clean -pa app1/deps/*/ebin -eval " \ + Apps = [list_to_atom(App) || \"app1/deps/\" ++ App <- filelib:wildcard(\"app1/deps/*\")], \ + [begin \ + io:format(\"Loading application ~p~n\", [App]), \ + case application:load(App) of \ + {error, _} -> ok; \ + ok -> \ + {ok, Mods} = application:get_key(App, modules), \ + [try io:format(\" Loading module ~p~n\", [Mod]), \ + {module, Mod} = code:load_file(Mod) \ + catch C:R -> timer:sleep(500), erlang:C(R) \ + end || Mod <- Mods] \ + end \ + end || App <- Apps], \ + halt()." endef $(foreach pkg,$(shell awk '{print $$1}' ../packages.v2.tsv),$(eval $(call pkg_test_target,$(pkg)))) |