Changeset 004d5c for tests


Ignore:
Timestamp:
Jul 10, 2012, 3:41:00 PM (13 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, 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:
5ffa05
Parents:
c1d78c
git-author:
Frederik Heber <heber@…> (07/09/12 15:04:43)
git-committer:
Frederik Heber <heber@…> (07/10/12 15:41:00)
Message:

Removed JobMarket as it is now in its own repository.

  • added ax_jobmarket.m4.
  • added check to configure.ac
  • Removed libraries libJobMarket... in Makefile.am's, replaced by JobMarket_..._LIBS.
  • changed some includes that now required JobMarket/ prefix.

Larger change to get JobMarket including its tests out of MoleCuilder:

  • configure has new enable-switch for JobMarket. Only then, we tests for its presence and usability (and also for boost::asio).
  • I do not know how to check for AM_CONDITIONAL or config.h values properly in a shell. Hence, I moved all regression tests dealing with the JobMarket into their own folder tests/JobMarket with depends on CONDJOBMARKET whether its included or not, similar to tests/Python.
  • TESTFIX: regression tests moved to tests/JobMarket have their paths changed.
  • FragmentationAutomationAction is now conditionally compiled in as well.
  • some Makefile.am's changed because we now have JobMarket_CFLAGS and _LIBS similar CodePatterns.
  • We use boost::preprocessor to add it dependently on HAVE_JOBMARKET to src/Actions/GlobalListOfActions.
  • TESTFIX: The former required a small change to CodeChecks test testsuite-globallistofactions_hpp as we can check no longer for the action name within brackets there.
  • FIX: I removed some unnecessary includes (defs.hpp) from MPQCCommandJob...hpp into the .cpp files.
Location:
tests
Files:
3 added
4 edited
17 moved

Legend:

Unmodified
Added
Removed

  • TabularUnified tests/CodeChecks/testsuite-globallistofactions_hpp.at

    rc1d78c r004d5c  
    2323  if test $found -eq 0
    2424  then
    25     AT_CHECK([grep "(${actionname})" ${abs_top_srcdir}/src/Actions/GlobalListOfActions.hpp], 0, [stdout], [ignore])
     25    AT_CHECK([grep "${actionname}" ${abs_top_srcdir}/src/Actions/GlobalListOfActions.hpp], 0, [stdout], [ignore])
    2626  else
    2727    echo "excluded."

  • TabularUnified tests/JobMarket/Makefile.am

    rc1d78c r004d5c  
    11AUTOM4TE = $(SHELL) $(top_srcdir)/build-aux/missing --run autom4te
     2
     3if CONDJOBMARKET
     4mpqc_SOURCES = $(srcdir)/mpqc.cpp
     5mpqc_CPPFLAGS = ${CodePatterns_CFLAGS}
     6mpqc_LDADD = \
     7        ${CodePatterns_LIBS}
     8
     9noinst_PROGRAMS = mpqc
     10endif
    211
    312EXTRA_DIST = \
    413        testsuite.at \
    514        $(TESTSUITE) \
    6         $(TESTSCRIPTS) \
    715        atlocal.in \
    8         $(srcdir)/package.m4
     16        molecuilder.in \
     17        $(srcdir)/package.m4 \
     18        pre \
     19        $(TESTSCRIPTS)
    920
     21if CONDJOBMARKET
    1022TESTSUITE = $(srcdir)/testsuite
     23endif
    1124
    1225DISTCLEANFILES = atconfig
    1326
    14 TESTSCRIPTS =
    15 
    16 TESTSCRIPTS += \
    17         $(srcdir)/testsuite-addingjobs.at \
    18         $(srcdir)/testsuite-checkstate.at \
    19         $(srcdir)/testsuite-completerun.at \
    20         $(srcdir)/testsuite-enrollinpool.at \
    21         $(srcdir)/testsuite-getresults.at \
    22         $(srcdir)/testsuite-resubmitjobs.at \
    23         $(srcdir)/testsuite-server-shutdown.at \
    24         $(srcdir)/testsuite-server-worker.at
     27TESTSCRIPTS = \
     28        $(srcdir)/testsuite-jobmarket.at \
     29        $(srcdir)/testsuite-jobmarket-molecuilderrun.at \
     30        $(srcdir)/testsuite-jobmarket-mpqc-jobs.at \
     31        $(srcdir)/testsuite-jobmarket-stand-in-mpqc.at
    2532
    2633max_jobs = 4
    … …  
    3441                esac; \
    3542        done; \
    36         $(SHELL) '$(TESTSUITE)' $$nrjobs AUTOTEST_PATH='$(abs_top_builddir)/src/JobMarket' $(TESTSUITEFLAGS)
     43        $(SHELL) '$(TESTSUITE)' $$nrjobs AUTOTEST_PATH='$(abs_top_builddir)/src' $(TESTSUITEFLAGS)
    3744
    3845installcheck-local: atconfig atlocal $(TESTSUITE)

  • TabularUnified tests/JobMarket/testsuite-jobmarket-molecuilderrun.at

    rc1d78c r004d5c  
    1111# create job files for stand-in mpqc
    1212i=0
    13 while test -e ${abs_top_srcdir}/tests/regression/Fragmentation/Automation/pre/BondFragment`printf %02d $i`.out; do
     13while test -e ${abs_top_srcdir}/tests/JobMarket/pre/BondFragment`printf %02d $i`.out; do
    1414  nr=`printf %02d $i`
    1515  echo "Creating Job${nr}.in"
    16   echo "${abs_top_srcdir}/tests/regression/Fragmentation/Automation/pre/BondFragment${nr}.out" >Job${nr}.in
     16  echo "${abs_top_srcdir}/tests/JobMarket/pre/BondFragment${nr}.out" >Job${nr}.in
    1717  ((i+=1))
    1818done
    … …  
    2929
    3030# use molecuilder to add jobs, wait for their completion and obtain results
    31 AT_CHECK([../../molecuilder -v 3 --fragment-automation --fragment-executable "../../mpqc" --fragment-path "${abs_top_srcdir}/tests/regression/Fragmentation/Automation/pre/" --fragment-jobs Job??.in --server-address 127.0.0.1 --server-port $CONTROLLERPORT], 0, [stdout], [ignore])
     31AT_CHECK([../../molecuilder -v 3 --fragment-automation --fragment-executable "../../mpqc" --fragment-path "${abs_top_srcdir}/tests/JobMarket/pre/" --fragment-jobs Job??.in --server-address 127.0.0.1 --server-port $CONTROLLERPORT], 0, [stdout], [ignore])
    3232AT_CHECK([fgrep "There are 7 fragments" stdout], 0, [ignore], [ignore], [kill $server_pid $worker_pid])
    3333AT_CHECK([fgrep "There are 23 atoms" stdout], 0, [ignore], [ignore], [kill $server_pid $worker_pid])

  • TabularUnified tests/JobMarket/testsuite-jobmarket-mpqc-jobs.at

    rc1d78c r004d5c  
    1212# create job files for stand-in mpqc
    1313i=0
    14 while test -e ${abs_top_srcdir}/tests/regression/Fragmentation/Automation/pre/BondFragment`printf %02d $i`.out; do
     14while test -e ${abs_top_srcdir}/tests/JobMarket/pre/BondFragment`printf %02d $i`.out; do
    1515  nr=`printf %02d $i`
    1616  echo "Creating Job${nr}.in"
    17   echo "${abs_top_srcdir}/tests/regression/Fragmentation/Automation/pre/BondFragment${nr}.out" >Job${nr}.in
     17  echo "${abs_top_srcdir}/tests/JobMarket/pre/BondFragment${nr}.out" >Job${nr}.in
    1818  ((i+=1))
    1919done
    … …  
    3636
    3737# check number of done jobs
    38 AT_CHECK([${AUTOTEST_PATH}/Controller --server 127.0.0.1:$CONTROLLERPORT --command receivempqc --fragment-path ${abs_top_srcdir}/tests/regression/Fragmentation/Automation/pre/], 0, [stdout], [ignore], [kill $server_pid])
     38AT_CHECK([${AUTOTEST_PATH}/Controller --server 127.0.0.1:$CONTROLLERPORT --command receivempqc --fragment-path ${abs_top_srcdir}/tests/JobMarket/pre/], 0, [stdout], [ignore], [kill $server_pid])
    3939AT_CHECK([fgrep "There are 7 fragments" stdout], 0, [ignore], [ignore], [kill $server_pid])
    4040AT_CHECK([fgrep "There are 23 atoms" stdout], 0, [ignore], [ignore], [kill $server_pid])

  • TabularUnified tests/JobMarket/testsuite-jobmarket-stand-in-mpqc.at

    rc1d78c r004d5c  
    99
    1010# Create Job00.in
    11 AT_CHECK([echo "${abs_top_srcdir}/tests/regression/Fragmentation/Automation/pre/BondFragment00.out" >Job00.in], 0)
     11AT_CHECK([echo "${abs_top_srcdir}/tests/JobMarket/pre/BondFragment00.out" >Job00.in], 0)
    1212
    1313# check prints the output file when given input file
    1414AT_CHECK([../../mpqc Job00.in], 0, [stdout], [ignore])
    15 AT_CHECK([diff stdout ${abs_top_srcdir}/tests/regression/Fragmentation/Automation/pre/BondFragment00.out], 0, [ignore], [ignore])
     15AT_CHECK([diff stdout ${abs_top_srcdir}/tests/JobMarket/pre/BondFragment00.out], 0, [ignore], [ignore])
    1616
    1717AT_CLEANUP

  • TabularUnified tests/JobMarket/testsuite.at

    rc1d78c r004d5c  
    44# In pre initial files are placed, in post results can be found to be checked by diff in this testsuite.
    55
    6 AT_INIT([Job Market])
    7 AT_TESTED(egrep find grep)
     6AT_INIT([Molecuilder JobMarket module])
     7AT_TESTED(diff grep egrep fgrep)
    88
    99# Use colored output with new-enough Autotest.
    1010m4_ifdef([AT_COLOR_TESTS], [AT_COLOR_TESTS])
    1111
    12 AT_BANNER([JobMarket - Code Checks])
    13 m4_include(atlocal)
    14 
    15 m4_include(testsuite-config_h.at)
    16 
    17 m4_include(testsuite-date_in_dox.at)
    18 
    19 m4_include(testsuite-memdebug.at)
    20 
    21 m4_include(testsuite-project-disclaimer.at)
    22 
    23 m4_include(testsuite-header-dist.at)
     12# JobMarket
     13m4_include([testsuite-jobmarket.at])

  • TabularUnified tests/Makefile.am

    rc1d78c r004d5c  
    1111endif
    1212
     13if CONDJOBMARKET
     14SUBDIRS += JobMarket
     15endif

  • TabularUnified tests/regression/Fragmentation/testsuite-fragmentation.at

    rc1d78c r004d5c  
    66# check whether parsing of BondFragment files and re-rwriting config files is working (exit code is 2 as we don't need to continue wrt to ...OrderAtSite)
    77m4_include([Fragmentation/FragmentMolecule-MaxOrder/testsuite-fragmentation-fragment-molecule-maxorder.at])
    8 
    9 # check whether stand-in mpqc program works
    10 m4_include([Fragmentation/Automation/testsuite-fragmentation-automation-stand-in-mpqc.at])
    11 
    12 # check whether mpqc jobs work
    13 m4_include([Fragmentation/Automation/testsuite-fragmentation-automation-mpqc-jobs.at])
    14 
    15 # check whether molecuilder may act as controller
    16 m4_include([Fragmentation/Automation/testsuite-fragmentation-automation-molecuilderrun.at])

  • TabularUnified tests/regression/Makefile.am

    rc1d78c r004d5c  
    11AUTOM4TE = $(SHELL) $(top_srcdir)/build-aux/missing --run autom4te
    2 
    3 mpqc_SOURCES = $(srcdir)/Fragmentation/Automation/mpqc.cpp
    4 mpqc_CPPFLAGS = ${CodePatterns_CFLAGS}
    5 mpqc_LDADD = \
    6         ${CodePatterns_LIBS}
    7 
    8 noinst_PROGRAMS = mpqc
    92
    103EXTRA_DIST = \
    … …  
    7568        $(srcdir)/Filling/SuspendInWater/testsuite-suspend-in-water.at \
    7669        $(srcdir)/Fragmentation/testsuite-fragmentation.at \
    77         $(srcdir)/Fragmentation/Automation/testsuite-fragmentation-automation-molecuilderrun.at \
    78         $(srcdir)/Fragmentation/Automation/testsuite-fragmentation-automation-mpqc-jobs.at \
    79         $(srcdir)/Fragmentation/Automation/testsuite-fragmentation-automation-stand-in-mpqc.at \
    8070        $(srcdir)/Fragmentation/FragmentMolecule/testsuite-fragmentation-fragment-molecule.at \
    8171        $(srcdir)/Fragmentation/FragmentMolecule-MaxOrder/testsuite-fragmentation-fragment-molecule-maxorder.at \
Note: See TracChangeset for help on using the changeset viewer.