aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2018-11-26 12:47:11 +0100
committerLoïc Hoguin <[email protected]>2018-11-26 12:47:11 +0100
commit5498bec3a1e3868258803382a92d31b4bc8014fa (patch)
treeb1f07e51528535d74070559cc8dce65d1fa86df8
parent746026ec5e197434c7235fe3f432b451d70881b1 (diff)
downloaderlang.mk-5498bec3a1e3868258803382a92d31b4bc8014fa.tar.gz
erlang.mk-5498bec3a1e3868258803382a92d31b4bc8014fa.tar.bz2
erlang.mk-5498bec3a1e3868258803382a92d31b4bc8014fa.zip
Fix badly written tests failing when LEGACY=1
-rw-r--r--test/core_app.mk20
1 files changed, 11 insertions, 9 deletions
diff --git a/test/core_app.mk b/test/core_app.mk
index 53149fc..c7eb8fb 100644
--- a/test/core_app.mk
+++ b/test/core_app.mk
@@ -2042,8 +2042,8 @@ core-app-hrl-multiapps-include-lib: build clean
$t test -f $(APP)/apps/my_app/src/use_blue.erl
$t test -f $(APP)/apps/my_app/src/use_red.erl
ifdef LEGACY
- $t test -f $(APP)/apps/my_lib.app.src
- $t test -f $(APP)/apps/my_app.app.src
+ $t test -f $(APP)/apps/my_lib/src/my_lib.app.src
+ $t test -f $(APP)/apps/my_app/src/my_app.app.src
endif
$i "Check that all build artifacts are removed"
@@ -2147,8 +2147,8 @@ core-app-hrl-multiapps-include-lib-recursive: build clean
$t test -f $(APP)/apps/my_app/src/use_blue.erl
$t test -f $(APP)/apps/my_app/src/use_red.erl
ifdef LEGACY
- $t test -f $(APP)/apps/my_lib.app.src
- $t test -f $(APP)/apps/my_app.app.src
+ $t test -f $(APP)/apps/my_lib/src/my_lib.app.src
+ $t test -f $(APP)/apps/my_app/src/my_app.app.src
endif
$i "Check that all build artifacts are removed"
@@ -2376,16 +2376,16 @@ core-app-hrl-deps: build clean
$t test -f $(APP)/apps/my_app/ebin/girl.beam
$t test -f $(APP)/deps/cowlib/ebin/cowlib.app
-# Applications in apps are compiled automatically but not added
-# to the application resource file unless they are listed in LOCAL_DEPS.
+ifndef LEGACY
$i "Check that the application was compiled correctly"
$t $(ERL) -pa $(APP)/apps/*/ebin/ -eval " \
ok = application:load(my_app), \
{ok, MyAppDeps} = application:get_key(my_app, applications), \
true = lists:member(cowlib, MyAppDeps), \
halt()"
+endif
-$i "Touch cowlib .hrl file; check that only required files are rebuilt"
+ $i "Touch cowlib .hrl file; check that only required files are rebuilt"
$t printf "%s\n" \
$(APP)/apps/my_app/my_app.d \
$(APP)/apps/my_app/ebin/my_app.app \
@@ -2438,12 +2438,14 @@ $i "Touch cowlib .hrl file; check that only required files are rebuilt"
$t test -f $(APP)/apps/my_app/ebin/girl.beam
$t test -d $(APP)/deps/cowlib
+ifndef LEGACY
$i "Check that the application was compiled correctly"
$t $(ERL) -pa $(APP)/apps/*/ebin/ -eval " \
ok = application:load(my_app), \
{ok, MyAppDeps} = application:get_key(my_app, applications), \
true = lists:member(cowlib, MyAppDeps), \
halt()"
+endif
core-app-hrl-include-loop: build clean
@@ -2616,8 +2618,8 @@ core-app-hrl-multiapps-include-loop-define-protected: build clean
$t test -f $(APP)/apps/my_app/src/use_blue.erl
$t test -f $(APP)/apps/my_app/src/use_red.erl
ifdef LEGACY
- $t test -f $(APP)/apps/my_lib.app.src
- $t test -f $(APP)/apps/my_app.app.src
+ $t test -f $(APP)/apps/my_lib/src/my_lib.app.src
+ $t test -f $(APP)/apps/my_app/src/my_app.app.src
endif
$i "Check that all build artifacts are removed"