Ignore:
Timestamp:
Mar 4, 2010, 10:40:52 AM (16 years ago)
Author:
Tillmann Crueger <crueger@…>
Branches:
Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, Candidate_v1.7.0, Candidate_v1.7.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable
Children:
63b56a7
Parents:
6a661c (diff), 66e95e (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:

Merge branch 'MenuRefactoring' into QT4Refactoring

Conflicts:

molecuilder/src/Makefile.am

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/unittests/Makefile.am

    r6a661c re6a9c1  
    1313  AnalysisCorrelationToSurfaceUnitTest \
    1414  AnalysisPairCorrelationUnitTest \
     15  atomsCalculationTest \
     16  AtomDescriptorTest \
    1517  BondGraphUnitTest \
     18  CacheableTest \
    1619  GSLMatrixSymmetricUnitTest \
    1720  GSLMatrixUnitTest \
    … …  
    2124  ListOfBondsUnitTest \
    2225  LogUnitTest \
     26  manipulateAtomsTest \
    2327  MemoryUsageObserverUnitTest \
    2428  MemoryAllocatorUnitTest \
     29  MoleculeDescriptorTest \
     30  ObserverTest \
    2531  StackClassUnitTest \
    2632  TesselationUnitTest \
    … …  
    2834  Tesselation_InOutsideUnitTest \
    2935  VectorUnitTest \
    30   ObserverTest \
    31   CacheableTest \
    32   DescriptorUnittest \
    33   manipulateAtomsTest \
    34   atomsCalculationTest \
    3536  ${MENUTESTS}
    3637 
    … …  
    4445TESTSOURCES = \
    4546  ActOnAllUnitTest.cpp \
     47  ActionSequenceTest.cpp \
    4648  analysisbondsunittest.cpp \
    4749  AnalysisCorrelationToPointUnitTest.cpp \
    4850  AnalysisCorrelationToSurfaceUnitTest.cpp  \
    4951  AnalysisPairCorrelationUnitTest.cpp \
     52  AtomDescriptorTest.cpp \
     53  atomsCalculationTest.cpp \
    5054  bondgraphunittest.cpp \
     55  CacheableTest.cpp \
    5156  gslmatrixsymmetricunittest.cpp \
    5257  gslmatrixunittest.cpp \
    … …  
    5661  listofbondsunittest.cpp \
    5762  logunittest.cpp \
     63  manipulateAtomsTest.cpp \
    5864  memoryallocatorunittest.cpp  \
    5965  memoryusageobserverunittest.cpp \
     66  MoleculeDescriptorTest.cpp \
     67  ObserverTest.cpp \
    6068  stackclassunittest.cpp \
    6169  tesselationunittest.cpp \
    6270  tesselation_boundarytriangleunittest.cpp \
    6371  tesselation_insideoutsideunittest.cpp \
    64   vectorunittest.cpp \
    65   ObserverTest.cpp \
    66   CacheableTest.cpp \
    67   DescriptorUnittest.cpp \
    68   manipulateAtomsTest.cpp \
    69   atomsCalculationTest.cpp \
    70   ActionSequenceTest.cpp
     72  vectorunittest.cpp
    7173
    7274TESTHEADERS = \
    … …  
    118120MemoryUsageObserverUnitTest_LDADD = ${ALLLIBS}
    119121
     122MoleculeDescriptorTest_SOURCES = UnitTestMain.cpp MoleculeDescriptorTest.cpp MoleculeDescriptorTest.hpp
     123MoleculeDescriptorTest_LDADD = ${ALLLIBS}
     124
    120125StackClassUnitTest_SOURCES = UnitTestMain.cpp stackclassunittest.cpp stackclassunittest.hpp
    121126StackClassUnitTest_LDADD = ${ALLLIBS}
    … …  
    142147CacheableTest_LDADD = ${ALLLIBS}
    143148
    144 DescriptorUnittest_SOURCES = UnitTestMain.cpp DescriptorUnittest.cpp DescriptorUnittest.hpp
    145 DescriptorUnittest_LDADD = ${ALLLIBS}
     149AtomDescriptorTest_SOURCES = UnitTestMain.cpp AtomDescriptorTest.cpp AtomDescriptorTest.hpp
     150AtomDescriptorTest_LDADD = ${ALLLIBS}
    146151
    147152manipulateAtomsTest_SOURCES = UnitTestMain.cpp manipulateAtomsTest.cpp manipulateAtomsTest.hpp
Note: See TracChangeset for help on using the changeset viewer.