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.

2 files changed, 28 insertions, 0 deletions

diff --git a/test/core_app.mk b/test/core_app.mk
index a782e65..1acaef1 100644
--- a/test/core_app.mk
+++ b/test/core_app.mk
@@ -91,7 +91,9 @@ core-app-asn1: build clean-core-app-asn1
 	$t test -f $(APP)/asn1/CAP.asn1
 	$t test -f $(APP)/asn1/Def.asn1
 	$t test -f $(APP)/include/unrelated.hrl
+ifdef LEGACY
 	$t test -f $(APP)/src/$(APP).app.src
+endif
 	$t test -f $(APP)/src/use_cap.erl
 	$t test -f $(APP)/src/use_def.erl
 
@@ -292,7 +294,9 @@ core-app-generate-erl: build clean-core-app-generate-erl
 	$t test -f $(APP)/Makefile
 	$t test -f $(APP)/erlang.mk
 	$t test -f $(APP)/script.sh
+ifdef LEGACY
 	$t test -f $(APP)/src/$(APP).app.src
+endif
 	$t test -f $(APP)/src/boy.erl
 	$t test -f $(APP)/src/girl.erl
 
@@ -457,7 +461,9 @@ core-app-generate-erl-prepend: build clean-core-app-generate-erl-prepend
 	$t test -f $(APP)/Makefile
 	$t test -f $(APP)/erlang.mk
 	$t test -f $(APP)/script.sh
+ifdef LEGACY
 	$t test -f $(APP)/src/$(APP).app.src
+endif
 	$t test -f $(APP)/src/boy.erl
 	$t test -f $(APP)/src/girl.erl
 
@@ -556,7 +562,9 @@ core-app-hrl: build clean-core-app-hrl
 	$t test -f $(APP)/erlang.mk
 	$t test -f $(APP)/include/blue.hrl
 	$t test -f $(APP)/include/red.hrl
+ifdef LEGACY
 	$t test -f $(APP)/src/$(APP).app.src
+endif
 	$t test -f $(APP)/src/use_blue.erl
 	$t test -f $(APP)/src/use_red.erl
 
@@ -643,7 +651,9 @@ core-app-hrl-recursive: build clean-core-app-hrl-recursive
 	$t test -f $(APP)/include/blue.hrl
 	$t test -f $(APP)/include/pill.hrl
 	$t test -f $(APP)/include/red.hrl
+ifdef LEGACY
 	$t test -f $(APP)/src/$(APP).app.src
+endif
 	$t test -f $(APP)/src/use_blue.erl
 	$t test -f $(APP)/src/use_red.erl
 
@@ -740,7 +750,9 @@ core-app-mib: build clean-core-app-mib
 	$t test -f $(APP)/include/unrelated.hrl
 	$t test -f $(APP)/mibs/EX1-MIB.mib
 	$t test -f $(APP)/mibs/OTP-REG.mib
+ifdef LEGACY
 	$t test -f $(APP)/src/$(APP).app.src
+endif
 	$t test -f $(APP)/src/use_v1.erl
 	$t test -f $(APP)/src/use_v2.erl
 
@@ -867,7 +879,9 @@ NO_MAKEDEP ?= 1\
 	$t test -f $(APP)/erlang.mk
 	$t test -f $(APP)/include/blue.hrl
 	$t test -f $(APP)/include/red.hrl
+ifdef LEGACY
 	$t test -f $(APP)/src/$(APP).app.src
+endif
 	$t test -f $(APP)/src/use_blue.erl
 	$t test -f $(APP)/src/use_red.erl
 
@@ -956,7 +970,9 @@ core-app-xrl: build clean-core-app-xrl
 	$i "Check that source files still exist"
 	$t test -f $(APP)/Makefile
 	$t test -f $(APP)/erlang.mk
+ifdef LEGACY
 	$t test -f $(APP)/src/$(APP).app.src
+endif
 	$t test -f $(APP)/src/boy.erl
 	$t test -f $(APP)/src/erlang_scan.xrl
 	$t test -f $(APP)/src/girl.erl
@@ -1092,7 +1108,9 @@ core-app-xrl-include: build clean-core-app-xrl-include
 	$i "Check that source files still exist"
 	$t test -f $(APP)/Makefile
 	$t test -f $(APP)/erlang.mk
+ifdef LEGACY
 	$t test -f $(APP)/src/$(APP).app.src
+endif
 	$t test -f $(APP)/src/boy.erl
 	$t test -f $(APP)/src/girl.erl
 	$t test -f $(APP)/src/errvals.hrl
@@ -1186,7 +1204,9 @@ core-app-yrl: build clean-core-app-yrl
 	$i "Check that source files still exist"
 	$t test -f $(APP)/Makefile
 	$t test -f $(APP)/erlang.mk
+ifdef LEGACY
 	$t test -f $(APP)/src/$(APP).app.src
+endif
 	$t test -f $(APP)/src/boy.erl
 	$t test -f $(APP)/src/girl.erl
 	$t test -f $(APP)/src/xmerl_xpath_parse.yrl
@@ -1297,7 +1317,9 @@ core-app-yrl-include: build clean-core-app-yrl-include
 	$i "Check that source files still exist"
 	$t test -f $(APP)/Makefile
 	$t test -f $(APP)/erlang.mk
+ifdef LEGACY
 	$t test -f $(APP)/src/$(APP).app.src
+endif
 	$t test -f $(APP)/src/boy.erl
 	$t test -f $(APP)/src/core_parse.hrl
 	$t test -f $(APP)/src/core_parse.yrl
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