Put programs in alphabetical order

That's easier to maintain.

dune/common/test/.gitignore

+# Stuff from the build system
 Makefile
 Makefile.in
 .deps
 .libs
+*.gcda
+*.gcno
+*.log
+*.trs
+gmon.out
 semantic.cache
-diagonalmatrixtest
-dynvectortest
-fvectortest
-mpicollectivecommunication
-lrutest
+
+# The test binaries (in alphabetical order)
 arraylisttest
-shared_ptrtest
-testfloatcmp
+arraytest
+bigunsignedinttest
 bitsetvectortest
-iteratorfacadetest
-sllisttest
-tuplestest
-tupleutilitytest
+blockbitfieldtest
+check_fvector_size
+conversiontest
+diagonalmatrixtest
+dynmatrixtest
+dynvectortest
+eigenvaluestest
 enumsettest
+fassigntest
 fmatrixtest
-dynmatrixtest
-poolallocatortest
-*.gcda
-*.gcno
-gmon.out
+fvectortest
 gcdlcmtest
-streamtest
-exprtmpl
-timing_xpr
-timing_old
-timing_flt
-bigunsignedinttest
+iteratorfacadetest
+iteratorfacadetest2
+lrutest
+mpicollectivecommunication
 mpiguardtest
 mpihelpertest
+mpihelpertest2
+nullptr-test
+parametertreetest
+pathtest
+poolallocatortest
+shared_ptrtest
 singletontest
-utilitytest
+shared_ptrtest_config
+shared_ptrtest_dune
+sllisttest
+static_assert_test
+streamtest
+testdebugallocator
+testdebugallocator_fail1
+testdebugallocator_fail2
+testdebugallocator_fail3
+testdebugallocator_fail4
+testdebugallocator_fail5
 testfassign_fail1
 testfassign_fail2
 testfassign_fail3
@@ -44,32 +61,19 @@ testfassign1
 testfassign2
 testfassign3
 testfassign4
-conversiontest
-nullptr-test
-blockbitfieldtest
-fassigntest
-iteratorfacadetest2
-static_assert_test
-parametertreetest
-tags
-pathtest
-TAGS
-mpihelpertest2
+testfloatcmp
 testfconstruct
-arraytest
-shared_ptrtest_config
-shared_ptrtest_dune
+timing_xpr
+timing_old
+timing_flt
+tuplestest
 tuplestest_dune
 tuplestest_std
 tuplestest_tr1
-check_fvector_size
-testdebugallocator
-testdebugallocator_fail1
-testdebugallocator_fail2
-testdebugallocator_fail3
-testdebugallocator_fail4
-testdebugallocator_fail5
-eigenvaluestest
+tupleutilitytest
 typetraitstest
-*.log
-*.trs
+utilitytest
+
+tags
+TAGS
+

dune/common/test/Makefile.am

@@ -105,60 +105,27 @@ noinst_HEADERS = dummyiterator.hh iteratorfacadetest.hh
 testincludedir = $(includedir)/dune/common/test
 testinclude_HEADERS = checkmatrixinterface.hh iteratortest.hh
 
-# define the programs
-pathtest_SOURCES = pathtest.cc
-
-parametertreetest_SOURCES = parametertreetest.cc
-
-bitsetvectortest_SOURCES = bitsetvectortest.cc
-
-diagonalmatrixtest_SOURCES = diagonalmatrixtest.cc
-
-nullptr_test_SOURCES = nullptr-test.cc nullptr-test2.cc
-nullptr_test_fail_SOURCES = nullptr-test.cc
-nullptr_test_fail_CPPFLAGS = $(AM_CPPFLAGS) -DFAIL
-
-static_assert_test_SOURCES = static_assert_test.cc
-static_assert_test_fail_SOURCES = static_assert_test_fail.cc
-
-fassigntest_SOURCES = fassigntest.cc
-
-bigunsignedinttest_SOURCES=bigunsignedinttest.cc
-bigunsignedinttest_CPPFLAGS = $(AM_CPPFLAGS) $(BOOST_CPPFLAGS)
-
-lrutest_SOURCES = lrutest.cc
-
-sllisttest_SOURCES = sllisttest.cc
-
+# define the programs (in alphabetical order)
 arraylisttest_SOURCES = arraylisttest.cc
 
 arraytest_SOURCES = arraytest.cc
 
-shared_ptrtest_config_SOURCES = shared_ptrtest.cc
-
-shared_ptrtest_dune_SOURCES = shared_ptrtest.cc
-shared_ptrtest_dune_CPPFLAGS = $(AM_CPPFLAGS)   \
-    -DDISABLE_CONFIGURED_SHARED_PTR
-
-tuplestest_dune_SOURCES = tuplestest.cc
-tuplestest_dune_CPPFLAGS = $(AM_CPPFLAGS)       \
-    -DDISABLE_TR1_TUPLE -DDISABLE_STD_TUPLE
+bigunsignedinttest_SOURCES=bigunsignedinttest.cc
+bigunsignedinttest_CPPFLAGS = $(AM_CPPFLAGS) $(BOOST_CPPFLAGS)
 
-tuplestest_std_SOURCES = tuplestest.cc
+bitsetvectortest_SOURCES = bitsetvectortest.cc
 
-tuplestest_tr1_SOURCES = tuplestest.cc
-tuplestest_tr1_CPPFLAGS = $(AM_CPPFLAGS)        \
-    -DDISABLE_STD_TUPLE
+check_fvector_size_fail1_SOURCES = check_fvector_size_fail.cc
+check_fvector_size_fail1_CPPFLAGS = $(AM_CPPFLAGS) -DDIM=1
 
-tupleutilitytest_SOURCES = tupleutilitytest.cc
+check_fvector_size_fail2_SOURCES = check_fvector_size_fail.cc
+check_fvector_size_fail2_CPPFLAGS = $(AM_CPPFLAGS) -DDIM=3
 
-streamtest_SOURCES = streamtest.cc
+check_fvector_size_SOURCES = check_fvector_size.cc
 
-# mention headers so that they are distributed too
-iteratorfacadetest_SOURCES = iteratorfacadetest.cc iteratorfacadetest.hh \
-   iteratortest.hh
+conversiontest_SOURCES = conversiontest.cc
 
-iteratorfacadetest2_SOURCES = iteratorfacadetest2.cc
+diagonalmatrixtest_SOURCES = diagonalmatrixtest.cc
 
 dynmatrixtest_SOURCES = dynmatrixtest.cc
 
@@ -167,24 +134,36 @@ dynvectortest_SOURCES = dynvectortest.cc
 eigenvaluestest_SOURCES = eigenvaluestest.cc
 eigenvaluestest_LDADD = $(LAPACK_LIBS) $(LDADD) $(BLAS_LIBS) $(LIBS) $(FLIBS)
 
+enumsettest_SOURCES = enumsettest.cc
+
+fassigntest_SOURCES = fassigntest.cc
+
 fmatrixtest_SOURCES = fmatrixtest.cc
 fmatrixtest_LDADD = $(LAPACK_LIBS) $(LDADD) $(BLAS_LIBS) $(LIBS) $(FLIBS)
 
 fvectortest_SOURCES = fvectortest.cc
 
-check_fvector_size_fail1_SOURCES = check_fvector_size_fail.cc
-check_fvector_size_fail1_CPPFLAGS = $(AM_CPPFLAGS) -DDIM=1
+gcdlcmtest_SOURCES = gcdlcmtest.cc
 
-check_fvector_size_fail2_SOURCES = check_fvector_size_fail.cc
-check_fvector_size_fail2_CPPFLAGS = $(AM_CPPFLAGS) -DDIM=3
+genericiterator_compile_fail_SOURCES = genericiterator_compile_fail.cc
 
-check_fvector_size_SOURCES = check_fvector_size.cc
+# mention headers so that they are distributed too
+iteratorfacadetest_SOURCES = iteratorfacadetest.cc iteratorfacadetest.hh \
+   iteratortest.hh
 
-poolallocatortest_SOURCES = poolallocatortest.cc
+iteratorfacadetest2_SOURCES = iteratorfacadetest2.cc
 
-enumsettest_SOURCES=enumsettest.cc
+lrutest_SOURCES = lrutest.cc
 
-gcdlcmtest_SOURCES = gcdlcmtest.cc
+mpicollectivecommunication_SOURCES = mpicollectivecommunication.cc
+mpicollectivecommunication_CPPFLAGS = $(AM_CPPFLAGS) $(DUNEMPICPPFLAGS)
+mpicollectivecommunication_LDADD = $(DUNEMPILIBS) $(LDADD)
+mpicollectivecommunication_LDFLAGS = $(AM_LDFLAGS) $(DUNEMPILDFLAGS)
+
+mpiguardtest_SOURCES = mpiguardtest.cc
+mpiguardtest_CPPFLAGS = $(AM_CPPFLAGS) $(DUNEMPICPPFLAGS)
+mpiguardtest_LDADD = $(DUNEMPILIBS) $(LDADD)
+mpiguardtest_LDFLAGS = $(AM_LDFLAGS) $(DUNEMPILDFLAGS)
 
 mpihelpertest_SOURCES = mpihelpertest.cc
 mpihelpertest_CPPFLAGS = $(AM_CPPFLAGS) $(DUNEMPICPPFLAGS)
@@ -196,21 +175,32 @@ mpihelpertest2_CPPFLAGS = $(AM_CPPFLAGS) $(DUNEMPICPPFLAGS) -DMPIHELPER_PREINITI
 mpihelpertest2_LDADD = $(DUNEMPILIBS) $(LDADD)
 mpihelpertest2_LDFLAGS = $(AM_LDFLAGS) $(DUNEMPILDFLAGS)
 
-mpicollectivecommunication_SOURCES = mpicollectivecommunication.cc
-mpicollectivecommunication_CPPFLAGS = $(AM_CPPFLAGS) $(DUNEMPICPPFLAGS)
-mpicollectivecommunication_LDADD = $(DUNEMPILIBS) $(LDADD)
-mpicollectivecommunication_LDFLAGS = $(AM_LDFLAGS) $(DUNEMPILDFLAGS)
+nullptr_test_SOURCES = nullptr-test.cc nullptr-test2.cc
+nullptr_test_fail_SOURCES = nullptr-test.cc
+nullptr_test_fail_CPPFLAGS = $(AM_CPPFLAGS) -DFAIL
 
-mpiguardtest_SOURCES = mpiguardtest.cc
-mpiguardtest_CPPFLAGS = $(AM_CPPFLAGS) $(DUNEMPICPPFLAGS)
-mpiguardtest_LDADD = $(DUNEMPILIBS) $(LDADD)
-mpiguardtest_LDFLAGS = $(AM_LDFLAGS) $(DUNEMPILDFLAGS)
+parametertreetest_SOURCES = parametertreetest.cc
+
+pathtest_SOURCES = pathtest.cc
+
+poolallocatortest_SOURCES = poolallocatortest.cc
+
+shared_ptrtest_config_SOURCES = shared_ptrtest.cc
+
+shared_ptrtest_dune_SOURCES = shared_ptrtest.cc
+shared_ptrtest_dune_CPPFLAGS = $(AM_CPPFLAGS)   \
+    -DDISABLE_CONFIGURED_SHARED_PTR
 
 singletontest_SOURCES = singletontest.cc
 
-typetraitstest_SOURCES = typetraitstest.cc
+sllisttest_SOURCES = sllisttest.cc
 
-utilitytest_SOURCES = utilitytest.cc
+sourcescheck_NOSOURCES = timing.cc
+
+static_assert_test_SOURCES = static_assert_test.cc
+static_assert_test_fail_SOURCES = static_assert_test_fail.cc
+
+streamtest_SOURCES = streamtest.cc
 
 testdebugallocator_SOURCES = testdebugallocator.cc
 testdebugallocator_CPPFLAGS = $(AM_CPPFLAGS)
@@ -269,13 +259,25 @@ testfconstruct_fail1_CPPFLAGS = $(AM_CPPFLAGS) -DFVSIZE=2
 testfconstruct_fail2_SOURCES = testfconstruct.cc
 testfconstruct_fail2_CPPFLAGS = $(AM_CPPFLAGS) -DFVSIZE=5
 
-conversiontest_SOURCES = conversiontest.cc
+testfloatcmp_SOURCES = testfloatcmp.cc
 
-sourcescheck_NOSOURCES = timing.cc
+tuplestest_dune_SOURCES = tuplestest.cc
+tuplestest_dune_CPPFLAGS = $(AM_CPPFLAGS)       \
+    -DDISABLE_TR1_TUPLE -DDISABLE_STD_TUPLE
+
+tuplestest_std_SOURCES = tuplestest.cc
+
+tuplestest_tr1_SOURCES = tuplestest.cc
+tuplestest_tr1_CPPFLAGS = $(AM_CPPFLAGS)        \
+    -DDISABLE_STD_TUPLE
+
+tupleutilitytest_SOURCES = tupleutilitytest.cc
+
+typetraitstest_SOURCES = typetraitstest.cc
+
+utilitytest_SOURCES = utilitytest.cc
 
-testfloatcmp_SOURCES = testfloatcmp.cc
 
-genericiterator_compile_fail_SOURCES = genericiterator_compile_fail.cc
 
 include $(top_srcdir)/am/global-rules