Merge branch 'maint'

* maint:
  Fix compilation of examples and tc names on windows
  Create erl.ini for host emulator

3 files changed, 30 insertions, 21 deletions

diff --git a/erts/Makefile.in b/erts/Makefile.in
index 1979c50781..79a66a3ba2 100644
--- a/erts/Makefile.in
+++ b/erts/Makefile.in
@@ -106,6 +106,7 @@ local_setup:
 	 	chmod 755 $(ERL_TOP)/bin/erl.exe $(ERL_TOP)/bin/erlc.exe \
 			 $(ERL_TOP)/bin/werl.exe; \
 		make_local_ini.sh $(ERL_TOP); \
+		cp $(ERL_TOP)/bin/erl.ini $(ERL_TOP)/bin/$(TARGET)/erl.ini; \
 	else \
 	sed	-e "s;%FINAL_ROOTDIR%;$(ERL_TOP);"   \
 		-e "s;erts-.*/bin;bin/$(TARGET);"    \
diff --git a/lib/mnesia/test/Makefile b/lib/mnesia/test/Makefile
index ae4c9626c7..f041fef85b 100644
--- a/lib/mnesia/test/Makefile
+++ b/lib/mnesia/test/Makefile
@@ -52,24 +52,29 @@ MODULES= \
 	mnesia_cost \
 	mnesia_dbn_meters 
 
-MnesiaExamplesDir := ../examples
+DocExamplesDir := ../doc/src/
 
-ExampleModules =  \
+DocExampleModules =  \
 	company \
 	company_o \
-	bup \
-	mnesia_meter \
-	mnesia_tpcb       
-ExamplesHrl = \
+	bup
+
+DocExamplesHrl = \
 	company.hrl \
 	company_o.hrl
 
-ERL_FILES= $(MODULES:%=%.erl) $(ExampleModules:%=$(MnesiaExamplesDir)/%.erl)
+ExamplesDir := ../examples/
+
+ExampleModules = \
+	mnesia_meter \
+	mnesia_tpcb
 
-HRL_FILES= mnesia_test_lib.hrl $(ExamplesHrl:%=$(MnesiaExamplesDir)/%)
+ERL_FILES= $(MODULES:%=%.erl) $(DocExampleModules:%=$(DocExamplesDir)/%.erl) $(ExampleModules:%=$(ExamplesDir)/%.erl)
+
+HRL_FILES= mnesia_test_lib.hrl $(DocExamplesHrl:%=$(DocExamplesDir)/%)
 
 TARGET_FILES= \
-	$(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(ExampleModules:%=$(EBIN)/%.$(EMULATOR)) 
+	$(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(DocExampleModules:%=$(EBIN)/%.$(EMULATOR)) $(ExampleModules:%=$(EBIN)/%.$(EMULATOR))
 
 INSTALL_PROGS= $(TARGET_FILES)
 
@@ -91,7 +96,10 @@ EBIN = .
 
 tests debug opt: $(TARGET_FILES)
 
-$(EBIN)/%.beam: $(MnesiaExamplesDir)/%.erl
+$(EBIN)/%.beam: $(DocExamplesDir)/%.erl
+	$(ERLC) -bbeam $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
+
+$(EBIN)/%.beam: $(ExamplesDir)/%.erl
 	$(ERLC) -bbeam $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
 
 clean:
diff --git a/lib/mnesia/test/mnesia_consistency_test.erl b/lib/mnesia/test/mnesia_consistency_test.erl
index f38e13f3a2..bb21723e27 100644
--- a/lib/mnesia/test/mnesia_consistency_test.erl
+++ b/lib/mnesia/test/mnesia_consistency_test.erl
@@ -100,7 +100,7 @@ groups() ->
        {group, updates_during_checkpoint_iteration},
        {group, load_table_with_activated_checkpoint},
        {group,
-	add_table_copy_to_table_with_activated_checkpoint}]},
+	add_table_copy_to_table_checkpoint}]},
      {updates_during_checkpoint_activation, [],
       [updates_during_checkpoint_activation_2_ram,
        updates_during_checkpoint_activation_2_disc,
@@ -116,10 +116,10 @@ groups() ->
       [load_table_with_activated_checkpoint_ram,
        load_table_with_activated_checkpoint_disc,
        load_table_with_activated_checkpoint_disc_only]},
-     {add_table_copy_to_table_with_activated_checkpoint, [],
-      [add_table_copy_to_table_with_activated_checkpoint_ram,
-       add_table_copy_to_table_with_activated_checkpoint_disc,
-       add_table_copy_to_table_with_activated_checkpoint_disc_only]},
+     {add_table_copy_to_table_checkpoint, [],
+      [add_table_copy_to_table_checkpoint_ram,
+       add_table_copy_to_table_checkpoint_disc,
+       add_table_copy_to_table_checkpoint_disc_only]},
      {backup_consistency, [],
       [{group, interupted_install_fallback},
        {group, interupted_uninstall_fallback},
@@ -952,16 +952,16 @@ view(Source, Mod) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-add_table_copy_to_table_with_activated_checkpoint_ram(suite) -> [];
-add_table_copy_to_table_with_activated_checkpoint_ram(Config) when is_list(Config) ->
+add_table_copy_to_table_checkpoint_ram(suite) -> [];
+add_table_copy_to_table_checkpoint_ram(Config) when is_list(Config) ->
     add_table_copy_to_table_with_activated_checkpoint(ram_copies, Config).
 
-add_table_copy_to_table_with_activated_checkpoint_disc(suite) -> [];
-add_table_copy_to_table_with_activated_checkpoint_disc(Config) when is_list(Config) ->
+add_table_copy_to_table_checkpoint_disc(suite) -> [];
+add_table_copy_to_table_checkpoint_disc(Config) when is_list(Config) ->
     add_table_copy_to_table_with_activated_checkpoint(disc_copies, Config).
 
-add_table_copy_to_table_with_activated_checkpoint_disc_only(suite) -> [];
-add_table_copy_to_table_with_activated_checkpoint_disc_only(Config) when is_list(Config) ->
+add_table_copy_to_table_checkpoint_disc_only(suite) -> [];
+add_table_copy_to_table_checkpoint_disc_only(Config) when is_list(Config) ->
     add_table_copy_to_table_with_activated_checkpoint(disc_only_copies, Config).
 
 add_table_copy_to_table_with_activated_checkpoint(Type,Config) ->