Changeset 2877c5

Timestamp:

Mar 2, 2017, 1:58:27 PM (8 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, AutomationFragmentation_failures, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_ChronosMutex, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, GeometryObjects, Gui_displays_atomic_force_velocity, IndependentFragmentGrids_IntegrationTest, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, RotateToPrincipalAxisSystem_UndoRedo, StoppableMakroAction, Subpackage_levmar, Subpackage_vmg, ThirdParty_MPQC_rebuilt_buildsystem, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, Ubuntu_1604_changes, stable

Children:

8918aa

Parents:

794a65

git-author:

Frederik Heber <heber@…> (02/23/17 13:33:56)

git-committer:

Frederik Heber <heber@…> (03/02/17 13:58:27)

Message:

FIX: mpqc's test programs needed env SCLIBDIR in case of enable-production.

• for all molecuilder_mpqc.in we also set SCLIBDIR such that validate and integration tests work as well.

Files:

• ThirdParty/mpqc_open/configure.ac (modified) (1 diff)
• ThirdParty/mpqc_open/src/bin/mpqc/validate/molecuilder_mpqc.in (modified) (1 diff)
• ThirdParty/mpqc_open/src/lib/Makefile.am (modified) (1 diff)
• ThirdParty/mpqc_open/src/lib/test_env.sh.in (added)
• tests/integration/molecuilder_mpqc.in (modified) (1 diff)

ThirdParty/mpqc_open/configure.ac

@@ -1921 +1921 @@
 ])
 AC_CONFIG_FILES([src/bin/mpqc/validate/molecuilder_mpqc], [chmod +x src/bin/mpqc/validate/molecuilder_mpqc])
+AC_CONFIG_FILES([src/lib/test_env.sh], [chmod +x src/lib/test_env.sh])
 
 AC_OUTPUT

ThirdParty/mpqc_open/src/bin/mpqc/validate/molecuilder_mpqc.in

@@ -4 +4 @@
 
 . ../../atlocal
+
+SCLIBDIR="@abs_top_srcdir@/lib"
+export SCLIBDIR
 
 if test -e ${AUTOTEST_PATH}/bin/mpqc/molecuilder_mpqc; then

ThirdParty/mpqc_open/src/lib/Makefile.am

@@ -1 +1 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src/lib $(EXTRADEFINES) $(MPI_CXXFLAGS)
 AM_LDFLAGS = $(MPI_LDFLAGS)
+
+# need SCLIBDIR set in case of "enable-production"
+AM_TESTS_ENVIRONMENT = \
+        . $(builddir)/test_env.sh;
+TESTS_ENVIRONMENT = $(AM_TESTS_ENVIRONMENT)
 
 MOSTLYCLEANFILES =

tests/integration/molecuilder_mpqc.in

@@ -4 +4 @@
 
 . ../../atlocal
+
+SCLIBDIR="@abs_top_srcdir@/ThirdParty/mpqc_open/lib"
+export SCLIBDIR
 
 if test -e ${AUTOTEST_PATH}/../ThirdParty/mpqc_open/src/bin/mpqc/molecuilder_mpqc; then