From 34d6b54342d4f80d80f09d74b3fa25be1d5a4fab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Wed, 9 Sep 2015 20:09:51 +0200 Subject: Move the test for help in its own category --- test/Makefile | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/test/Makefile b/test/Makefile index 78942e5..8d16994 100644 --- a/test/Makefile +++ b/test/Makefile @@ -71,13 +71,13 @@ build: .PHONY: core clean-core -core: core-app core-upgrade +core: core-app core-help core-upgrade -clean-core: clean-core-app clean-core-upgrade +clean-core: clean-core-app clean-core-help clean-core-upgrade # Core: Building applications. -CORE_APP_CASES = asn1 error generate-erl generate-erl-include generate-erl-prepend help hrl hrl-recursive mib no-app no-makedep xrl xrl-include yrl yrl-include +CORE_APP_CASES = asn1 error generate-erl generate-erl-include generate-erl-prepend hrl hrl-recursive mib no-app no-makedep xrl xrl-include yrl yrl-include CORE_APP_TARGETS = $(addprefix core-app-,$(CORE_APP_CASES)) CORE_APP_CLEAN_TARGETS = $(addprefix clean-,$(CORE_APP_TARGETS)) @@ -486,16 +486,6 @@ core-app-generate-erl-prepend: build clean-core-app-generate-erl-prepend [{module, M} = code:load_file(M) || M <- Mods], \ halt()" -core-app-help: build clean-core-app-help - - $i "Bootstrap a new OTP library named $(APP)" - $t mkdir $(APP)/ - $t cp ../erlang.mk $(APP)/ - $t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib $v - - $i "Run 'make help' and check that it prints help" - $t test -n "`$(MAKE) -C $(APP) help` | grep Usage" - core-app-hrl: build clean-core-app-hrl $i "Bootstrap a new OTP library named $(APP)" @@ -1332,6 +1322,21 @@ clean-core-app: $(CORE_APP_CLEAN_TARGETS) $(CORE_APP_CLEAN_TARGETS): $t rm -rf $(APP_TO_CLEAN)/ +# Core: Help. + +core-help: build clean-core-help + + $i "Bootstrap a new OTP library named $(APP)" + $t mkdir $(APP)/ + $t cp ../erlang.mk $(APP)/ + $t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib $v + + $i "Run 'make help' and check that it prints help" + $t test -n "`$(MAKE) -C $(APP) help` | grep Usage" + +clean-core-help: + $t rm -rf $(APP_TO_CLEAN)/ + # Core: Erlang.mk upgrade. CORE_UPGRADE_CASES = alt-erlangmk-repo no-config custom-config renamed-config custom-build-dir -- cgit v1.2.3