Skip to content

Commit

Permalink
Fix tests calling realtime script running against system install
Browse files Browse the repository at this point in the history
  • Loading branch information
zultron committed Jun 10, 2020
1 parent 94b350e commit 35a5af9
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 8 deletions.
2 changes: 2 additions & 0 deletions scripts/runtests.in
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ if test @RUN_IN_PLACE@ = yes; then
export HEADERS=@EMC2_HOME@/include
export LIBDIR=${TOPDIR}/lib
export INCLUDEPY=@INCLUDEPY@
export REALTIME=realtime
else
# Set $EMC2_HOME to $prefix for tests that depend on it
export SYSTEM_BUILD=1
Expand All @@ -34,6 +35,7 @@ else
export LIBDIR=@EMC2_HOME@/lib
export INCLUDEPY=@INCLUDEPY@
export LINUXCNC_EMCSH=@WISH@
export REALTIME=/etc/init.d/realtime
export SUDO=sudo
fi
export INCLUDEPY=@INCLUDEPY@
Expand Down
4 changes: 2 additions & 2 deletions tests/hal-link-unlink/test.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/bash

realtime start
$REALTIME start
linuxcnc-python hallink.py

realtime stop
$REALTIME stop

exit $?
4 changes: 2 additions & 2 deletions tests/halmodule.0/test.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
realtime start
$REALTIME start
./test.py
realtime stop
$REALTIME stop
4 changes: 2 additions & 2 deletions tests/save.0/test.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh
realtime start
$REALTIME start
halcmd -f expected
halcmd save
halcmd unload all
realtime stop
$REALTIME stop
4 changes: 2 additions & 2 deletions tests/tclsh-extensions/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# (runtests needs to run without a display, but LINUXCNC_EMCSH is always a
# wish-like program. Assume we can get the related non-wish interpreter in the
# obvious way)
realtime start
$REALTIME start
${LINUXCNC_EMCSH/wish/tclsh} test.tcl; exitval=$?
realtime stop
$REALTIME stop
exit $exitval

0 comments on commit 35a5af9

Please sign in to comment.