[glom/glom-1-14] Move tests out of sub-directories, simplifying the build file.

[Murray Cumming <murrayc src gnome org>]

commit dceaa3d1b989cb3afe1965e4e4ae226ba1ff98aa
Author: Murray Cumming <murrayc murrayc com>
Date:   Sat May 1 10:06:47 2010 +0200

    Move tests out of sub-directories, simplifying the build file.
    
    * tests/Makefile_test.am:
    	* tests/test_document_load.cc:
    	* tests/test_selfhosting_new_empty.cc: Move out of the sub-directories,
    	because they do not need extra files.

 ChangeLog                                          |    9 +++++++++
 Makefile_tests.am                                  |   16 ++++++++--------
 .../{test_document_load => }/test_document_load.cc |    0
 .../test_selfhosting_new_empty.cc                  |    0
 4 files changed, 17 insertions(+), 8 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c52fc38..8718663 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-05-01  Murray Cumming  <murrayc murrayc com>
+
+	Move tests out of sub-directories, simplifying the build file.
+
+	* tests/Makefile_test.am:
+	* tests/test_document_load.cc:
+	* tests/test_selfhosting_new_empty.cc: Move out of the sub-directories,
+	because they do not need extra files.
+
 2010-04-27  Murray Cumming  <murrayc murrayc-x61>
 
 	PyGlom: Don't use deprecated boost::python::args.
diff --git a/Makefile_tests.am b/Makefile_tests.am
index d393142..bb8b70e 100644
--- a/Makefile_tests.am
+++ b/Makefile_tests.am
@@ -21,7 +21,7 @@ check_PROGRAMS =						\
 	glom/libglom/test_sharedptr_layoutitem			\
 	glom/utility_widgets/test_flowtable			\
 	glom/test_pyembed					\
-	tests/test_document_load/test_document_load			\
+	tests/test_document_load			\
 	tests/test_parsing_time			\
 	tests/test_signal_reemit			\
 	tests/test_load_python_library\
@@ -33,9 +33,9 @@ check_PROGRAMS =						\
 	tests/import/test_signals \
 	tests/test_glade_derived_instantiation \
 	tests/glade_toplevels_instantiation \
-	tests/test_selfhosting_new_empty/test_selfhosting_new_empty
+	tests/test_selfhosting_new_empty
 
-TESTS =	tests/test_document_load/test_document_load	\
+TESTS =	tests/test_document_load	\
 	tests/test_parsing_time	\
 	tests/test_signal_reemit \
 	tests/test_dtd_file_validation.sh \
@@ -47,7 +47,7 @@ TESTS =	tests/test_document_load/test_document_load	\
 	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_empty
 	
 # These hang most of the time, but not always:
 #	tests/import/test_parsing \
@@ -69,7 +69,7 @@ glom_libglom_example_document_load_SOURCES = glom/libglom/example_document_load.
 glom_libglom_test_sharedptr_layoutitem_SOURCES = glom/libglom/test_sharedptr_layoutitem.cc
 glom_test_pyembed_SOURCES = glom/test_pyembed.cc
 
-tests_test_document_load_test_document_load_SOURCES = tests/test_document_load/test_document_load.cc
+tests_test_document_load_SOURCES = tests/test_document_load.cc
 tests_test_parsing_time_SOURCES = tests/test_parsing_time.cc
 tests_test_signal_reemit_SOURCES = tests/test_signal_reemit.cc
 tests_test_load_python_library_SOURCES = tests/test_load_python_library.cc
@@ -93,7 +93,7 @@ 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_empty_SOURCES = tests/test_selfhosting_new_empty.cc $(glom_source_files)
 
 glom_libglom_test_connectionpool_LDADD = $(tests_ldadd)
 glom_libglom_example_document_load_LDADD = $(tests_ldadd)
@@ -128,7 +128,7 @@ tests_glade_toplevels_instantiation_LDADD = $(tests_ldadd) $(LIBGLOM_LIBS) $(GLO
 glom_test_pyembed_LDADD = $(LIBGLOM_LIBS) $(PYTHON_LIBS)
 
 tests_test_parsing_time_LDADD = $(tests_ldadd)
-tests_test_document_load_test_document_load_LDADD = $(tests_ldadd) $(LIBGLOM_LIBS)
+tests_test_document_load_LDADD = $(tests_ldadd) $(LIBGLOM_LIBS)
 tests_test_signal_reemit_LDADD = $(LIBGLOM_LIBS)
 tests_test_load_python_library_LDADD = $(LIBGLOM_LIBS)
 tests_test_python_module_LDADD = $(tests_ldadd) $(PYTHON_LIBS)
@@ -138,4 +138,4 @@ tests_test_python_execute_script_LDADD = $(tests_ldadd) $(GLOM_LIBS) $(PYTHON_LI
 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_empty_LDADD = $(glom_all_libs)
diff --git a/tests/test_document_load/test_document_load.cc b/tests/test_document_load.cc
similarity index 100%
rename from tests/test_document_load/test_document_load.cc
rename to tests/test_document_load.cc
diff --git a/tests/test_selfhosting_new_empty/test_selfhosting_new_empty.cc b/tests/test_selfhosting_new_empty.cc
similarity index 100%
rename from tests/test_selfhosting_new_empty/test_selfhosting_new_empty.cc
rename to tests/test_selfhosting_new_empty.cc