Changeset 1e58bb for tests/integration/molecuilder_poolworker.in

Timestamp:

Apr 10, 2018, 6:42:56 AM (7 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

AutomationFragmentation_failures, Candidate_v1.6.1, ChemicalSpaceEvaluator, Enhanced_StructuralOptimization_continued, Exclude_Hydrogens_annealWithBondGraph, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_contraction-expansion, Gui_displays_atomic_force_velocity, JobMarket_RobustOnKillsSegFaults, PythonUI_with_named_parameters, StoppableMakroAction, TremoloParser_IncreasedPrecision

Children:

a5c293

Parents:

456f19

git-author:

Frederik Heber <frederik.heber@…> (04/07/18 21:09:55)

git-committer:

Frederik Heber <frederik.heber@…> (04/10/18 06:42:56)

Message:

FIX: Integration tests now abort safely when one of the programs dies.

• I used the trick with running the program inside the script in the background, see ​https://stackoverflow.com/a/1645157/1967646, and using wait as in "​https://stackoverflow.com/a/29535256/1967646" to still obtain the exit code. This is used in the poolworker wrapper scripts.
• TESTS: Removed extra stored pid for worker_script. We now kill the wrapper script which in turn kills the executable.

File:

• tests/integration/molecuilder_poolworker.in (modified) (3 diffs)

tests/integration/molecuilder_poolworker.in

@@ -1 @@
-#!/bin/sh
+#!/bin/bash
 #
 # wrapper for testing molecuilder
@@ -5 +5 @@
 . ../../atlocal
 
+trap 'echo "Killing process group $$"; pkill --signal 9 -P $$' SIGTERM SIGINT
+
+#PGID=$(ps -o pgid= $PID | grep -o [0-9]*)
+#trap 'kill -- -"$PGID"' SIGINT SIGTERM
+
 SCLIBDIR="@abs_top_srcdir@/ThirdParty/mpqc_open/lib"
 export SCLIBDIR
 
 if test -e ${AUTOTEST_PATH}/molecuilder_poolworker; then
-        ${AUTOTEST_PATH}/molecuilder_poolworker $@
+        ${AUTOTEST_PATH}/molecuilder_poolworker $@ &
 else
         echo "Could not find molecuilder_poolworker."
@@ -15 +20 @@
 fi
 
+# we need the wait here (and poolworker running in the background) as otherwise
+# the above trap will not get activated.
+wait $!
+
 status=$?