aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--test/Makefile88
1 files changed, 44 insertions, 44 deletions
diff --git a/test/Makefile b/test/Makefile
index 8d16994..0df0dd3 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1339,7 +1339,7 @@ clean-core-help:
# Core: Erlang.mk upgrade.
-CORE_UPGRADE_CASES = alt-erlangmk-repo no-config custom-config renamed-config custom-build-dir
+CORE_UPGRADE_CASES = custom-build-dir custom-config custom-repo no-config renamed-config
CORE_UPGRADE_TARGETS = $(addprefix core-upgrade-,$(CORE_UPGRADE_CASES))
CORE_UPGRADE_CLEAN_TARGETS = $(addprefix clean-,$(CORE_UPGRADE_TARGETS))
@@ -1347,7 +1347,49 @@ CORE_UPGRADE_CLEAN_TARGETS = $(addprefix clean-,$(CORE_UPGRADE_TARGETS))
core-upgrade: $(CORE_UPGRADE_TARGETS)
-core-upgrade-alt-erlangmk-repo: build clean-core-upgrade-alt-erlangmk-repo
+core-upgrade-custom-build-dir: build clean-core-upgrade-custom-build-dir
+
+ $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 "Append a rule to the Erlang.mk file for testing purposes"
+ $t echo "erlang_mk_upgrade_test_rule: ; @echo FAIL" >> $(APP)/erlang.mk
+
+ $i "Check that the test rule works as intended"
+ $t test "FAIL" = "`$(MAKE) -C $(APP) --no-print-directory erlang_mk_upgrade_test_rule V=0`"
+
+ $i "Create the custom build directory"
+ $t mkdir $(APP)/custom/
+ $t test -d $(APP)/custom/
+
+ $i "Upgrade Erlang.mk with a custom build directory"
+ $t ERLANG_MK_BUILD_DIR=custom $(MAKE) -C $(APP) erlang-mk $v
+
+ $i "Check that the rule is gone"
+ $t if $(MAKE) -C $(APP) erlang_mk_upgrade_test_rule $v; then false; fi
+
+ $i "Check that the custom build directory is gone"
+ $t test ! -d $(APP)/custom/
+
+core-upgrade-custom-config: build clean-core-upgrade-custom-config
+
+ $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 "Create a custom build.config file without plugins"
+ $t echo "core/*" > $(APP)/build.config
+
+ $i "Upgrade Erlang.mk"
+ $t $(MAKE) -C $(APP) erlang-mk $v
+
+ $i "Check that the bootstrap plugin is gone"
+ $t if $(MAKE) -C $(APP) list-templates $v; then false; fi
+
+core-upgrade-custom-repo: build clean-core-upgrade-custom-repo
$i "Bootstrap a new OTP library named $(APP)"
$t mkdir $(APP)/
@@ -1396,22 +1438,6 @@ core-upgrade-no-config: build clean-core-upgrade-no-config
$i "Check that the rule is gone"
$t if $(MAKE) -C $(APP) erlang_mk_upgrade_test_rule $v; then false; fi
-core-upgrade-custom-config: build clean-core-upgrade-custom-config
-
- $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 "Create a custom build.config file without plugins"
- $t echo "core/*" > $(APP)/build.config
-
- $i "Upgrade Erlang.mk"
- $t $(MAKE) -C $(APP) erlang-mk $v
-
- $i "Check that the bootstrap plugin is gone"
- $t if $(MAKE) -C $(APP) list-templates $v; then false; fi
-
core-upgrade-renamed-config: build clean-core-upgrade-renamed-config
$i "Bootstrap a new OTP library named $(APP)"
@@ -1431,32 +1457,6 @@ core-upgrade-renamed-config: build clean-core-upgrade-renamed-config
$i "Check that the bootstrap plugin is gone"
$t if $(MAKE) -C $(APP) list-templates $v; then false; fi
-core-upgrade-custom-build-dir: build clean-core-upgrade-custom-build-dir
-
- $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 "Append a rule to the Erlang.mk file for testing purposes"
- $t echo "erlang_mk_upgrade_test_rule: ; @echo FAIL" >> $(APP)/erlang.mk
-
- $i "Check that the test rule works as intended"
- $t test "FAIL" = "`$(MAKE) -C $(APP) --no-print-directory erlang_mk_upgrade_test_rule V=0`"
-
- $i "Create the custom build directory"
- $t mkdir $(APP)/custom/
- $t test -d $(APP)/custom/
-
- $i "Upgrade Erlang.mk with a custom build directory"
- $t ERLANG_MK_BUILD_DIR=custom $(MAKE) -C $(APP) erlang-mk $v
-
- $i "Check that the rule is gone"
- $t if $(MAKE) -C $(APP) erlang_mk_upgrade_test_rule $v; then false; fi
-
- $i "Check that the custom build directory is gone"
- $t test ! -d $(APP)/custom/
-
clean-core-upgrade: $(CORE_UPGRADE_CLEAN_TARGETS)
$(CORE_UPGRADE_CLEAN_TARGETS):