Ignore:
Timestamp:
Mar 5, 2010, 1:45:35 PM (16 years ago)
Author:
Saskia Metzler <metzler@…>
Children:
2704e2
Parents:
5aefaa (diff), 025ca2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

solve merge conflict

Merge commit 'till/StructureRefactoring' into StateAndFormatParser

Conflicts:

molecuilder/src/unittests/Makefile.am

File:
1 edited

Legend:

Unmodified
Added
Removed

  • molecuilder/src/unittests/Makefile.am

    r5aefaa rfd9d77  
    1212  AnalysisCorrelationToSurfaceUnitTest \
    1313  AnalysisPairCorrelationUnitTest \
     14  atomsCalculationTest \
     15  AtomDescriptorTest \
    1416  BondGraphUnitTest \
     17  CacheableTest \
    1518  GSLMatrixSymmetricUnitTest \
    1619  GSLMatrixUnitTest \
    … …  
    2023  ListOfBondsUnitTest \
    2124  LogUnitTest \
     25  manipulateAtomsTest \
    2226  MemoryUsageObserverUnitTest \
    2327  MemoryAllocatorUnitTest \
     28  MoleculeDescriptorTest \
     29  ObserverTest \
     30  ParserUnitTest \
    2431  StackClassUnitTest \
    2532  TesselationUnitTest \
    … …  
    2734  Tesselation_InOutsideUnitTest \
    2835  VectorUnitTest \
    29   ObserverTest \
    30   CacheableTest \
    31   DescriptorUnittest \
    32   ParserUnitTest \
    33   manipulateAtomsTest \
    34   atomsCalculationTest \
    35   ${MENUTESTS} 
    36    
     36  ${MENUTESTS}
     37 
     38
    3739 
    3840check_PROGRAMS = $(TESTS)
    … …  
    4446TESTSOURCES = \
    4547  ActOnAllUnitTest.cpp \
     48  ActionSequenceTest.cpp \
    4649  analysisbondsunittest.cpp \
    4750  AnalysisCorrelationToPointUnitTest.cpp \
    4851  AnalysisCorrelationToSurfaceUnitTest.cpp  \
    4952  AnalysisPairCorrelationUnitTest.cpp \
     53  AtomDescriptorTest.cpp \
     54  atomsCalculationTest.cpp \
    5055  bondgraphunittest.cpp \
     56  CacheableTest.cpp \
     57  DescriptorUnittest.cpp \
    5158  gslmatrixsymmetricunittest.cpp \
    5259  gslmatrixunittest.cpp \
    … …  
    5663  listofbondsunittest.cpp \
    5764  logunittest.cpp \
     65  manipulateAtomsTest.cpp \
    5866  memoryallocatorunittest.cpp  \
    5967  memoryusageobserverunittest.cpp \
     68  MoleculeDescriptorTest.cpp \
     69  ObserverTest.cpp \
     70  ParserUnitTest.cpp \
    6071  stackclassunittest.cpp \
    6172  tesselationunittest.cpp \
    6273  tesselation_boundarytriangleunittest.cpp \
    6374  tesselation_insideoutsideunittest.cpp \
    64   vectorunittest.cpp \
    65   ObserverTest.cpp \
    66   CacheableTest.cpp \
    67   DescriptorUnittest.cpp \
    68   ParserUnitTest.cpp \
    69   manipulateAtomsTest.cpp \
    70   atomsCalculationTest.cpp \
    71   ActionSequenceTest.cpp
     75  vectorunittest.cpp
    7276
    7377TESTHEADERS = \
    … …  
    119123MemoryUsageObserverUnitTest_LDADD = ${ALLLIBS}
    120124
     125MoleculeDescriptorTest_SOURCES = UnitTestMain.cpp MoleculeDescriptorTest.cpp MoleculeDescriptorTest.hpp
     126MoleculeDescriptorTest_LDADD = ${ALLLIBS}
     127
    121128StackClassUnitTest_SOURCES = UnitTestMain.cpp stackclassunittest.cpp stackclassunittest.hpp
    122129StackClassUnitTest_LDADD = ${ALLLIBS}
    … …  
    143150CacheableTest_LDADD = ${ALLLIBS}
    144151
    145 DescriptorUnittest_SOURCES = UnitTestMain.cpp DescriptorUnittest.cpp DescriptorUnittest.hpp
    146 DescriptorUnittest_LDADD = ${ALLLIBS}
     152AtomDescriptorTest_SOURCES = UnitTestMain.cpp AtomDescriptorTest.cpp AtomDescriptorTest.hpp
     153AtomDescriptorTest_LDADD = ${ALLLIBS}
    147154
    148155ParserUnitTest_SOURCES = UnitTestMain.cpp ParserUnitTest.cpp ParserUnitTest.hpp
Note: See TracChangeset for help on using the changeset viewer.