Skip to content

Commit 770c40a

Browse files
committed
fix halcompile test to work both rip and installed
(cherry picked from commit febc65a)
1 parent c1d5d29 commit 770c40a

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

  • tests/halcompile/personalities_mod

tests/halcompile/personalities_mod/test.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@ halcompile --personalities=2 --install $DIR/bitslice.comp
88

99
# This tells us the expected filename extension ${MODULE_EXT} of realtime
1010
# modules.
11-
source "${EMC2_HOME}/scripts/rtapi.conf"
11+
if [[ -f "${EMC2_HOME}/scripts/rtapi.conf" ]]; then
12+
source "${EMC2_HOME}/scripts/rtapi.conf"
13+
else
14+
source "/etc/linuxcnc/rtapi.conf"
15+
fi
1216

13-
for INSTALLED_FILE in "${EMC2_HOME}"/rtlib/{lincurve,logic,bitslice}"${MODULE_EXT}"; do
17+
for INSTALLED_FILE in "${RTLIB_DIR}"/{lincurve,logic,bitslice}"${MODULE_EXT}"; do
1418
if [[ ! -f "${INSTALLED_FILE}" ]]; then
1519
echo "'halcompile --install' did not install '${INSTALLED_FILE}'"
1620
exit 1

0 commit comments

Comments
 (0)