diff options
Diffstat (limited to 'erts/emulator/test/Makefile')
| -rw-r--r-- | erts/emulator/test/Makefile | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/erts/emulator/test/Makefile b/erts/emulator/test/Makefile index 33a80f2e53..21add610bb 100644 --- a/erts/emulator/test/Makefile +++ b/erts/emulator/test/Makefile @@ -123,6 +123,7 @@ MODULES= \ trace_meta_SUITE \ trace_call_count_SUITE \ trace_call_time_SUITE \ + trace_call_memory_SUITE \ tracer_SUITE \ tracer_test \ scheduler_SUITE \ @@ -149,6 +150,16 @@ NO_OPT= bs_bincomp \ guard \ map +R25= \ + bs_bincomp \ + bs_construct \ + bs_match_bin \ + bs_match_int \ + bs_match_tail \ + bs_match_misc \ + bs_utf + + NATIVE= hibernate NO_OPT_MODULES= $(NO_OPT:%=%_no_opt_SUITE) @@ -157,6 +168,9 @@ NO_OPT_ERL_FILES= $(NO_OPT_MODULES:%=%.erl) NATIVE_MODULES= $(NATIVE:%=%_native_SUITE) NATIVE_ERL_FILES= $(NATIVE_MODULES:%=%.erl) +R25_MODULES= $(R25:%=%_r25_SUITE) +R25_ERL_FILES= $(R25_MODULES:%=%.erl) + ERL_FILES= $(MODULES:%=%.erl) TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR)) @@ -188,13 +202,17 @@ ERL_COMPILE_FLAGS := $(filter-out +deterministic,$($(ERL_COMPILE_FLAGS))) # Targets # ---------------------------------------------------- -make_emakefile: $(NO_OPT_ERL_FILES) $(NATIVE_ERL_FILES) $(KERNEL_ERL_FILES) +make_emakefile: $(NO_OPT_ERL_FILES) $(NATIVE_ERL_FILES) \ + $(KERNEL_ERL_FILES) $(R25_ERL_FILES) $(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) +compressed -o$(EBIN) \ $(MODULES) $(KERNEL_MODULES) >> $(EMAKEFILE) $(ERL_TOP)/make/make_emakefile +no_copt +no_postopt +no_ssa_opt +no_bsm_opt \ $(ERL_COMPILE_FLAGS) -o$(EBIN) $(NO_OPT_MODULES) >> $(EMAKEFILE) $(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) \ -o$(EBIN) $(NATIVE_MODULES) >> $(EMAKEFILE) + $(ERL_TOP)/make/make_emakefile +r25 \ + $(ERL_COMPILE_FLAGS) -o$(EBIN) $(R25_MODULES) >> $(EMAKEFILE) + tests debug opt: make_emakefile erl $(ERL_MAKE_FLAGS) -make @@ -218,6 +236,9 @@ targets: $(TARGET_FILES) %_native_SUITE.erl: %_SUITE.erl sed -e 's;-module($(basename $<));-module($(basename $@));' $< > $@ +%_r25_SUITE.erl: %_SUITE.erl + sed -e 's;-module($(basename $<));-module($(basename $@));' $< > $@ + # ---------------------------------------------------- # Release Target # ---------------------------------------------------- @@ -232,6 +253,7 @@ release_tests_spec: make_emakefile $(INSTALL_DATA) $(NO_OPT_ERL_FILES) "$(RELSYSDIR)" $(INSTALL_DATA) $(NATIVE_ERL_FILES) "$(RELSYSDIR)" $(INSTALL_DATA) $(KERNEL_ERL_FILES) "$(RELSYSDIR)" + $(INSTALL_DATA) $(R25_ERL_FILES) "$(RELSYSDIR)" chmod -R u+w "$(RELSYSDIR)" tar cf - *_SUITE_data property_test | (cd "$(RELSYSDIR)"; tar xf -) |