[glom: 3/3] Merged from glom-1-14

[Murray Cumming <murrayc src gnome org>]

commit c4190cccaae7a5332b9fcde95b854dbd7496fbeb
Merge: 15f8a65 63be021
Author: Murray Cumming <murrayc murrayc com>
Date:   Sat May 1 11:26:33 2010 +0200

    Merged from glom-1-14

 ChangeLog                                          |   19 ++++
 Makefile_tests.am                                  |   29 ++++--
 glom/libglom/document/bakery/document.cc           |    9 ++-
 tests/test_document_autosave.cc                    |  111 ++++++++++++++++++++
 .../{test_document_load => }/test_document_load.cc |    0
 .../test_selfhosting_new_empty.cc                  |    0
 .../test_selfhosting_new_from_example.cc           |    0
 7 files changed, 156 insertions(+), 12 deletions(-)
---
diff --cc Makefile_tests.am
index d4f2822,9576ff0..d042fe1
--- a/Makefile_tests.am
+++ b/Makefile_tests.am
@@@ -33,10 -34,10 +34,15 @@@ check_PROGRAMS =						
  	tests/import/test_signals \
  	tests/test_glade_derived_instantiation \
  	tests/glade_toplevels_instantiation \
++<<<<<<< HEAD:Makefile_tests.am
 +	tests/test_selfhosting_new_empty/test_selfhosting_new_empty \
 +	tests/test_selfhosting_new_from_example/test_selfhosting_new_from_example
++=======
+ 	tests/test_selfhosting_new_empty
++>>>>>>> glom-1-14:Makefile_tests.am
  
- TESTS =	tests/test_document_load/test_document_load	\
+ TESTS =	tests/test_document_load	\
+   tests/test_document_autosave	\
  	tests/test_parsing_time	\
  	tests/test_signal_reemit \
  	tests/test_dtd_file_validation.sh \
@@@ -48,8 -49,7 +54,8 @@@
  	tests/test_python_execute_func \
  	tests/test_python_execute_func_date \
  	tests/test_python_execute_script \
- 	tests/test_selfhosting_new_empty/test_selfhosting_new_empty \
- 	tests/test_selfhosting_new_from_example/test_selfhosting_new_from_example
 -	tests/test_selfhosting_new_empty
++	tests/test_selfhosting_new_empty \
++	tests/test_selfhosting_new_from_example
  	
  # These hang most of the time, but not always:
  #	tests/import/test_parsing \
@@@ -95,8 -96,7 +102,8 @@@ tests_import_test_signals_SOURCES =	
  	tests/import/utils.h\
  	tests/import/test_signals.cc
  tests_test_glade_derived_instantiation_SOURCES = tests/test_glade_derived_instantiation.cc $(glom_source_files)
- tests_test_selfhosting_new_empty_test_selfhosting_new_empty_SOURCES = tests/test_selfhosting_new_empty/test_selfhosting_new_empty.cc $(glom_source_files)
- tests_test_selfhosting_new_from_example_test_selfhosting_new_from_example_SOURCES = tests/test_selfhosting_new_from_example/test_selfhosting_new_from_example.cc $(glom_source_files)
+ tests_test_selfhosting_new_empty_SOURCES = tests/test_selfhosting_new_empty.cc $(glom_source_files)
++tests_test_selfhosting_new_from_example_SOURCES = tests/test_selfhosting_new_from_example.cc $(glom_source_files)
  
  glom_libglom_test_connectionpool_LDADD = $(tests_ldadd)
  glom_libglom_example_document_load_LDADD = $(tests_ldadd)
@@@ -141,5 -142,4 +149,6 @@@ tests_test_python_execute_script_LDADD 
  tests_import_test_parsing_LDADD = $(LIBGLOM_LIBS) $(GLOM_LIBS)
  tests_import_test_signals_LDADD = $(LIBGLOM_LIBS) $(GLOM_LIBS)
  tests_test_glade_derived_instantiation_LDADD = $(glom_all_libs)
- tests_test_selfhosting_new_empty_test_selfhosting_new_empty_LDADD = $(glom_all_libs)
- tests_test_selfhosting_new_from_example_test_selfhosting_new_from_example_LDADD = $(glom_all_libs)
+ tests_test_selfhosting_new_empty_LDADD = $(glom_all_libs)
++tests_test_selfhosting_new_from_example_LDADD = $(glom_all_libs)
++
diff --cc tests/test_selfhosting_new_from_example.cc
index 81cb508,0000000..81cb508
mode 100644,000000..100644
--- a/tests/test_selfhosting_new_from_example.cc
+++ b/tests/test_selfhosting_new_from_example.cc