Changeset 53f32e

Timestamp:

Oct 7, 2009, 3:04:23 PM (16 years ago)

Author:

Saskia Metzler <metzler@…>

Children:

afbb6c0

Parents:

729279

git-author:

Saskia Metzler <metzler@…> (10/07/09 15:01:14)

git-committer:

Saskia Metzler <metzler@…> (10/07/09 15:04:23)

Message:

temp commit

Location:

molecuilder

Files:

• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (2 diffs, 1 prop)
• src/builder.cpp (modified) (1 prop)
• src/helpers.cpp (modified) (1 prop)
• src/helpers.hpp (modified) (1 prop)
• src/memoryallocator.hpp (modified) (1 prop)
• src/unittests/Makefile.am (added)
• src/unittests/memoryallocatorunittest.cpp (moved) (moved from molecuilder/src/memoryallocatorunittest.cpp )
• src/unittests/memoryallocatorunittest.hpp (moved) (moved from molecuilder/src/memoryallocatorunittest.hpp )
• src/unittests/memoryusageobserverunittest.cpp (moved) (moved from molecuilder/src/memoryusageobserverunittest.cpp )
• src/unittests/memoryusageobserverunittest.hpp (moved) (moved from molecuilder/src/memoryusageobserverunittest.hpp )
• src/unittests/tesselationunittest.cpp (moved) (moved from molecuilder/src/tesselationunittest.cpp )
• src/unittests/tesselationunittest.hpp (moved) (moved from molecuilder/src/tesselationunittest.hpp )
• src/unittests/vectorunittest.cpp (moved) (moved from molecuilder/src/vectorunittest.cpp )
• src/unittests/vectorunittest.hpp (moved) (moved from molecuilder/src/vectorunittest.hpp )

molecuilder/configure.ac

@@ -79 +79 @@
 AC_CONFIG_FILES([tests/molecuilder], [chmod +x tests/molecuilder])
 AC_CONFIG_FILES([doc/molecuilder.xml])
-AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile src/unittests/Makefile])
 AC_OUTPUT

molecuilder/src/Makefile.am

@@ +1 @@
+SUBDIRS = unittests
+
 SOURCE = atom.cpp bond.cpp boundary.cpp config.cpp element.cpp ellipsoid.cpp helpers.cpp leastsquaremin.cpp linkedcell.cpp moleculelist.cpp molecules.cpp parser.cpp periodentafel.cpp tesselation.cpp tesselationhelpers.cpp vector.cpp verbose.cpp
 HEADER = atom.hpp bond.hpp boundary.hpp config.hpp defs.hpp element.hpp ellipsoid.hpp helpers.hpp leastsquaremin.hpp linkedcell.hpp memoryallocator.hpp memoryusageobserver.cpp memoryusageobserver.hpp molecules.hpp parser.hpp periodentafel.hpp stackclass.hpp tesselation.hpp tesselationhelpers.hpp vector.hpp verbose.hpp
-
-noinst_PROGRAMS =  VectorUnitTest MemoryAllocatorUnitTest MemoryUsageObserverUnitTest
 
 bin_PROGRAMS = molecuilder joiner analyzer
@@ -11 +11 @@
 analyzer_SOURCES = analyzer.cpp datacreator.cpp element.cpp helpers.cpp memoryallocator.hpp memoryusageobserver.cpp memoryusageobserver.hpp periodentafel.cpp parser.cpp verbose.cpp helpers.hpp periodentafel.hpp parser.hpp datacreator.hpp 
 
-TESTS = VectorUnitTest MemoryAllocatorUnitTest
-check_PROGRAMS = $(TESTS)
-VectorUnitTest_SOURCES = defs.hpp helpers.cpp helpers.hpp leastsquaremin.cpp leastsquaremin.hpp memoryallocator.hpp memoryusageobserver.cpp memoryusageobserver.hpp vectorunittest.cpp vectorunittest.hpp vector.cpp vector.hpp verbose.cpp verbose.hpp 
-VectorUnitTest_CXXFLAGS = $(CPPUNIT_CFLAGS)
-VectorUnitTest_LDFLAGS = $(CPPUNIT_LIBS) -ldl
-
-MemoryAllocatorUnitTest_SOURCES = defs.hpp helpers.cpp helpers.hpp memoryallocatorunittest.cpp memoryallocatorunittest.hpp memoryallocator.hpp memoryusageobserver.cpp memoryusageobserver.hpp verbose.cpp verbose.hpp 
-MemoryAllocatorUnitTest_CXXFLAGS = $(CPPUNIT_CFLAGS)
-MemoryAllocatorUnitTest_LDFLAGS = $(CPPUNIT_LIBS) -ldl
-
-MemoryUsageObserverUnitTest_SOURCES = defs.hpp helpers.cpp helpers.hpp memoryusageobserverunittest.cpp memoryusageobserverunittest.hpp memoryusageobserver.hpp memoryusageobserver.cpp verbose.cpp verbose.hpp 
-MemoryUsageObserverUnitTest_CXXFLAGS = $(CPPUNIT_CFLAGS)
-MemoryUsageObserverUnitTest_LDFLAGS = $(CPPUNIT_LIBS) -ldl
-
 EXTRA_DIST = ${molecuilder_DATA}