Changeset 677e13 for test_all.sh

Timestamp:

Jul 28, 2010, 9:21:14 AM (14 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, 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:

400170, a7b777c

Parents:

7067bd6 (diff), 0430e3 (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 'stable' into StructureRefactoring

Conflicts:

src/Makefile.am

File:

• test_all.sh (modified) (4 diffs)

test_all.sh

@@ -21 +21 @@
 outfile="test.log";
 logfile="full.log";
+noprocs=1;
 docheck=0;
 docheck_mem=0;
@@ -40 +41 @@
   echo "  -o <outfile>          Outfile to use for test results";
   echo "  -f <logfile>          File to use for output from commands";
+  echo "  -j <no_proc>          Parallel compiling and tests";
   echo "  -s                    Short tests (no memcheck)";
   echo "  -c                    Only configure and compile (implies -s)";
   echo "  -O <opt-level>        Only compile this optimization level";
   echo "  -t <tmpDir>           Use tmpDir as temporary directory";
-  echo "  -p <prefix>           Prefix to use for directory names (standart MolecuilderTest)";
-}
-
-while getopts “ho:f:scO:t:p:” OPTION
+  echo "  -p <prefix>           Prefix to use for directory names (standard MolecuilderTest)";
+}
+
+while getopts “ho:f:j:scO:t:p:” OPTION
 do
   case $OPTION in
@@ -60 +62 @@
      logfile="$OPTARG";
      ;;
+   j)
+     noprocs=("$OPTARG");
+     ;;
    s)
      docheck_mem=1;
@@ -105 +110 @@
 function compile(){
   echo "Making";
-  make all install >>$logfile 2>&1;
+  if [ $noprocs -gt 1 ]; then
+    make -j$noprocs all install >>$logfile 2>&1;
+  else
+    make all install >>$logfile 2>&1;
+  fi
 }
 
 function check(){
   echo "Checking";
-  make check >> $logfile 2>&1;
+  if [ $noprocs -gt 1 ]; then
+    make -j$noprocs check >> $logfile 2>&1;
+  else
+    make check >> $logfile 2>&1;
+  fi
 }