diff options
| author | Loïc Hoguin <[email protected]> | 2015-09-29 16:19:18 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2015-09-29 16:19:18 +0200 |
| commit | 9c877396288532ae44cf17b555d9dc5e7c7e854a (patch) | |
| tree | 7e45c9ff0d729c6ae0fa995ea1b31dd7c76c7b76 /test/core_deps.mk | |
| parent | 074453dc954bd5188bc85077b6de728df3cbc6e2 (diff) | |
| download | erlang.mk-9c877396288532ae44cf17b555d9dc5e7c7e854a.tar.gz erlang.mk-9c877396288532ae44cf17b555d9dc5e7c7e854a.tar.bz2 erlang.mk-9c877396288532ae44cf17b555d9dc5e7c7e854a.zip | |
Use a deeper directory for core-deps-dir test
Diffstat (limited to 'test/core_deps.mk')
| -rw-r--r-- | test/core_deps.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/core_deps.mk b/test/core_deps.mk index 0ae1bdf..36bcbf7 100644 --- a/test/core_deps.mk +++ b/test/core_deps.mk @@ -522,7 +522,7 @@ core-deps-dir: build clean-core-deps-dir $t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib $v $i "Add Cowboy to the list of dependencies with a custom DEPS_DIR" - $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy\nDEPS_DIR ?= \$$(CURDIR)/libs\n"}' $(APP)/Makefile + $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy\nDEPS_DIR ?= \$$(CURDIR)/deep/libs\n"}' $(APP)/Makefile ifdef LEGACY $i "Add Cowboy to the applications key in the .app.src file" @@ -533,12 +533,12 @@ endif $t $(MAKE) -C $(APP) $v $i "Check that all dependencies were fetched in the custom DEPS_DIR" - $t test -d $(APP)/libs/cowboy - $t test -d $(APP)/libs/cowlib - $t test -d $(APP)/libs/ranch + $t test -d $(APP)/deep/libs/cowboy + $t test -d $(APP)/deep/libs/cowlib + $t test -d $(APP)/deep/libs/ranch $i "Check that the application was compiled correctly" - $t $(ERL) -pa $(APP)/ebin/ $(APP)/libs/*/ebin/ -eval " \ + $t $(ERL) -pa $(APP)/ebin/ $(APP)/deep/libs/*/ebin/ -eval " \ [ok = application:load(App) || App <- [$(APP), cowboy, cowlib, ranch]], \ {ok, Deps} = application:get_key($(APP), applications), \ true = lists:member(cowboy, Deps), \ |