diff options
| author | Loïc Hoguin <[email protected]> | 2014-10-29 11:47:55 +0100 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2014-10-29 11:47:55 +0100 |
| commit | 02e95a7cdc20719c7cca01a76c7cc28368d0aee5 (patch) | |
| tree | f9f126f8c427b948e48fb842dd6e8f9625e79caf | |
| parent | b5579c1fa7c6baae6ce4beeff3aba947f07a0bb6 (diff) | |
| parent | ebb1d234f624a7898f9f90015261745c80e34c7e (diff) | |
| download | erlang.mk-02e95a7cdc20719c7cca01a76c7cc28368d0aee5.tar.gz erlang.mk-02e95a7cdc20719c7cca01a76c7cc28368d0aee5.tar.bz2 erlang.mk-02e95a7cdc20719c7cca01a76c7cc28368d0aee5.zip | |
Merge branch 'fix-test-include' of git://github.com/ahf/erlang.mk
| -rw-r--r-- | erlang.mk | 2 | ||||
| -rw-r--r-- | plugins/ct.mk | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -580,7 +580,7 @@ build-ct-deps: $(ALL_TEST_DEPS_DIRS) @for dep in $(ALL_TEST_DEPS_DIRS) ; do $(MAKE) -C $$dep; done build-ct-suites: build-ct-deps - $(gen_verbose) erlc -v $(TEST_ERLC_OPTS) -o test/ \ + $(gen_verbose) erlc -v $(TEST_ERLC_OPTS) -I include/ -o test/ \ $(wildcard test/*.erl test/*/*.erl) -pa ebin/ tests-ct: ERLC_OPTS = $(TEST_ERLC_OPTS) diff --git a/plugins/ct.mk b/plugins/ct.mk index a2e64ef..4453b70 100644 --- a/plugins/ct.mk +++ b/plugins/ct.mk @@ -45,7 +45,7 @@ build-ct-deps: $(ALL_TEST_DEPS_DIRS) @for dep in $(ALL_TEST_DEPS_DIRS) ; do $(MAKE) -C $$dep; done build-ct-suites: build-ct-deps - $(gen_verbose) erlc -v $(TEST_ERLC_OPTS) -o test/ \ + $(gen_verbose) erlc -v $(TEST_ERLC_OPTS) -I include/ -o test/ \ $(wildcard test/*.erl test/*/*.erl) -pa ebin/ tests-ct: ERLC_OPTS = $(TEST_ERLC_OPTS) |