Ignore:
Timestamp:
Dec 5, 2010, 12:21:03 AM (15 years ago)
Author:
Frederik Heber <heber@…>
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:
fd19ff
Parents:
f03705 (diff), cabb46 (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 'ExtendLoadSaveXyztoAnyFormatParser' into stable

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/unittests/Makefile.am

    rf03705 r001f8a  
    3535  MoleculeDescriptorTest \
    3636  ObserverTest \
    37   ParserUnitTest \
     37  ParserCommonUnitTest \
     38  ParserTremoloUnitTest \
    3839  periodentafelTest \
    3940  PlaneUnittest \
     
    4849  VectorContentUnitTest \
    4950  VectorUnitTest
    50  
    51  
     51
     52
    5253check_PROGRAMS = $(TESTS)
    5354noinst_PROGRAMS = $(TESTS) TestRunner
     
    9697  MoleculeDescriptorTest.cpp \
    9798  ObserverTest.cpp \
    98   ParserUnitTest.cpp \
     99  ParserCommonUnitTest.cpp \
     100  ParserTremoloUnitTest.cpp \
    99101  periodentafelTest.cpp \
    100102  PlaneUnittest.cpp \
     
    137139  ObserverTest.hpp \
    138140  periodentafelTest.hpp \
    139   ParserUnitTest.hpp \
     141  ParserCommonUnitTest.hpp \
     142  ParserTremoloUnitTest.hpp \
    140143  PlaneUnittest.hpp \
    141144  RegistryUnitTest.hpp \
     
    203206LineUnittest_LDADD = ${ALLLIBS}
    204207
    205 LinkedCellUnitTest_SOURCES = UnitTestMain.cpp LinkedCellUnitTest.cpp LinkedCellUnitTest.hpp 
     208LinkedCellUnitTest_SOURCES = UnitTestMain.cpp LinkedCellUnitTest.cpp LinkedCellUnitTest.hpp
    206209LinkedCellUnitTest_LDADD = ${ALLLIBS}
    207210
     
    209212ListOfBondsUnitTest_LDADD = ${ALLLIBS}
    210213
    211 LogUnitTest_SOURCES = UnitTestMain.cpp logunittest.cpp logunittest.hpp 
     214LogUnitTest_SOURCES = UnitTestMain.cpp logunittest.cpp logunittest.hpp
    212215LogUnitTest_LDADD = ${ALLLIBS}
    213216
     
    227230ObserverTest_LDADD = ${ALLLIBS}
    228231
    229 ParserUnitTest_SOURCES = UnitTestMain.cpp ParserUnitTest.cpp ParserUnitTest.hpp
    230 ParserUnitTest_LDADD = ${ALLLIBS}
     232ParserCommonUnitTest_SOURCES = UnitTestMain.cpp ParserCommonUnitTest.cpp ParserCommonUnitTest.hpp
     233ParserCommonUnitTest_LDADD = ${ALLLIBS}
     234
     235ParserTremoloUnitTest_SOURCES = UnitTestMain.cpp ParserTremoloUnitTest.cpp ParserTremoloUnitTest.hpp
     236ParserTremoloUnitTest_LDADD = ${ALLLIBS}
    231237
    232238periodentafelTest_SOURCES = UnitTestMain.cpp periodentafelTest.cpp periodentafelTest.hpp
Note: See TracChangeset for help on using the changeset viewer.