Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions tests/tp/circle-curvature/test.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/bin/sh
set -e

# shellcheck disable=SC2086
${SUDO} halcompile --install curvaturecheck.c >/dev/null
halcompile --install curvaturecheck.c >/dev/null
halrun curvature.hal
echo 'circle curvature: OK'
11 changes: 11 additions & 0 deletions tests/ui-smoke/_lib/quit-launch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,17 @@ xvfb-run -a --server-args="-screen 0 $UI_SMOKE_XVFB_SCREEN" \
RC=0
fi

# A GUI that quit makes linuxcnc shut down by itself; let it.
# A SIGTERM to the group while it unloads kills the halcmd and
# rtapi_app clients halfway, and linuxcnc then unloads a second
# time on top of the first, leaving shared memory behind.
if [ "$RC" = 0 ]; then
for _ in $(seq 30); do
kill -0 "$LINUXCNC_PID" 2>/dev/null || break
sleep 1
done
fi

# Tear down whatever is left (task/motion, or the GUI on failure).
kill -TERM -- -"$LINUXCNC_PID" 2>/dev/null || true
for _ in $(seq 30); do
Expand Down
Loading