From 5bcfeece2f55cd8570b1356d9982756e99f90b40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Fri, 18 Sep 2015 14:34:58 +0200 Subject: Test "no .app.src" by default, test legacy with LEGACY=1 Also fixes two bugs with the new "no .app.src" method. All tests now pass with both methods. We can now test specific cases with make check c=$CASE. --- test/plugin_bootstrap.mk | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'test/plugin_bootstrap.mk') diff --git a/test/plugin_bootstrap.mk b/test/plugin_bootstrap.mk index b927a92..16bfb58 100644 --- a/test/plugin_bootstrap.mk +++ b/test/plugin_bootstrap.mk @@ -22,7 +22,9 @@ bootstrap-app: build clean-bootstrap-app $i "Check that all bootstrapped files exist" $t test -f $(APP)/Makefile +ifdef LEGACY $t test -f $(APP)/src/$(APP).app.src +endif $t test -f $(APP)/src/$(APP)_app.erl $t test -f $(APP)/src/$(APP)_sup.erl @@ -51,7 +53,9 @@ bootstrap-lib: build clean-bootstrap-lib $i "Check that all bootstrapped files exist" $t test -f $(APP)/Makefile +ifdef LEGACY $t test -f $(APP)/src/$(APP).app.src +endif $i "Build the application" $t $(MAKE) -C $(APP) $v @@ -77,7 +81,9 @@ bootstrap-rel: build clean-bootstrap-rel $t test -f $(APP)/relx.config $t test -f $(APP)/rel/sys.config $t test -f $(APP)/rel/vm.args +ifdef LEGACY $t test -f $(APP)/src/$(APP).app.src +endif $t test -f $(APP)/src/$(APP)_app.erl $t test -f $(APP)/src/$(APP)_sup.erl -- cgit v1.2.3