Changeset 97b825 for tests

Timestamp:

Aug 7, 2010, 2:44:24 PM (14 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:

458447

Parents:

5b4605

Message:

Shortened constructors [Meyers, "Effective C++" item 12]

• also rearranged some initialization list (one per line).

File:

• tests/regression/Makefile.am (modified) (1 diff)

tests/regression/Makefile.am

@@ -3 +3 @@
 TESTSUITE = $(srcdir)/testsuite
 
+max_jobs = 4
+ 
 check-local: atconfig atlocal package.m4 $(TESTSUITE)
-                $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS)
+        jobs=; \
+        for flag in $$MAKEFLAGS; do \
+                case $$flag in \
+                --* | =*=) ;; \
+                *j*) jobs="-j$(max_jobs)" ;; \
+                esac; \
+        done;
+        $(SHELL) '$(TESTSUITE)' $$jobs $(TESTSUITEFLAGS)
 
 installcheck-local: atconfig atlocal $(TESTSUITE)
-                $(SHELL) '$(TESTSUITE)' AUTOTEST_PATH='$(bindir)' \
-                $(TESTSUITEFLAGS)
-     
+        $(SHELL) '$(TESTSUITE)' AUTOTEST_PATH='$(bindir)' \
+        $(TESTSUITEFLAGS)
+
 clean-local:
-                test ! -f '$(TESTSUITE)' || \
-                $(SHELL) '$(TESTSUITE)' --clean
+        test ! -f '$(TESTSUITE)' || \
+        $(SHELL) '$(TESTSUITE)' --clean
 
 AUTOTEST = $(AUTOM4TE) --language=autotest
 $(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/testsuite-*.at
-                $(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
-                mv $@.tmp $@
+        $(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
+        mv $@.tmp $@
 
 # The `:;' works around a Bash 3.2 bug when the output is not writeable.
 $(srcdir)/package.m4: $(top_srcdir)/configure.ac
-                        :;{ \
-                                        echo '# Signature of the current package.' && \
-                                        echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])' && \
-                                        echo 'm4_define([AT_PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])' && \
-                                        echo 'm4_define([AT_PACKAGE_VERSION],   [@PACKAGE_VERSION@])' && \
-                                        echo 'm4_define([AT_PACKAGE_STRING],    [@PACKAGE_STRING@])' && \
-                                        echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
-                                } >'$(srcdir)/package.m4'
+        :;{ \
+                echo '# Signature of the current package.' && \
+                echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])' && \
+                echo 'm4_define([AT_PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])' && \
+                echo 'm4_define([AT_PACKAGE_VERSION],   [@PACKAGE_VERSION@])' && \
+                echo 'm4_define([AT_PACKAGE_STRING],    [@PACKAGE_STRING@])' && \
+                echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
+        } >'$(srcdir)/package.m4'