Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix path for icub-tests context #1117

Merged
merged 2 commits into from
May 16, 2022
Merged

Fix path for icub-tests context #1117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19672f0
Fix path for icub-tests context
gsisinna May 13, 2022
1f6c916
Fix icub-tests path and env variable
gsisinna May 13, 2022
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
2 changes: 1 addition & 1 deletion cmake/template/addPathsToUserEnvVariables.ps1.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Add-ValueToUserEnvVariable GAZEBO_RESOURCE_PATH $ROBOTOLOGY_SUPERBUILD_INSTALL_P
@cmakeif ROBOTOLOGY_ENABLE_ROBOT_TESTING
# ROBOTOLOGY_ENABLE_ROBOT_TESTING-specific lines
Add-ValueToUserEnvVariable PATH $ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX"\lib\robottestingframework";
Add-ValueToUserEnvVariable YARP_DATA_DIRS "@PROJECT_SOURCE_DIR_NATIVE_PATH@\robotology\icub-tests\suites";
Add-ValueToUserEnvVariable YARP_DATA_DIRS "@PROJECT_SOURCE_DIR_NATIVE_PATH@\src\icub-tests\suites";
Add-ValueToUserEnvVariable BLOCKTEST_RESOURCE_PATH $ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX"\bin";
@endcmakeif ROBOTOLOGY_ENABLE_ROBOT_TESTING

Expand Down
2 changes: 1 addition & 1 deletion cmake/template/removePathsFromUserEnvVariables.ps1.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Remove-ValueFromUserEnvVariable GAZEBO_RESOURCE_PATH $ROBOTOLOGY_SUPERBUILD_INST
@cmakeif ROBOTOLOGY_ENABLE_ROBOT_TESTING
# Cleanup ROBOTOLOGY_ENABLE_ROBOT_TESTING-specific lines
Remove-ValueFromUserEnvVariable PATH $ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX"\lib\robottestingframework";
Remove-ValueFromUserEnvVariable YARP_DATA_DIRS "@PROJECT_SOURCE_DIR_NATIVE_PATH@\robotology\icub-tests\suites";
Remove-ValueFromUserEnvVariable YARP_DATA_DIRS "@PROJECT_SOURCE_DIR_NATIVE_PATH@\src\icub-tests\suites";
Remove-ValueFromUserEnvVariable BLOCKTEST_RESOURCE_PATH $ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX"\bin";
@endcmakeif ROBOTOLOGY_ENABLE_ROBOT_TESTING

Expand Down
2 changes: 1 addition & 1 deletion cmake/template/setup.bat.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ set "GAZEBO_RESOURCE_PATH=%GAZEBO_RESOURCE_PATH%;%ROBOTOLOGY_SUPERBUILD_INSTALL_

@cmakeif ROBOTOLOGY_ENABLE_ROBOT_TESTING
set "PATH=%PATH%;%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%\lib\robottestingframework
set "YARP_DATA_DIRS=%YARP_DATA_DIRS%;@PROJECT_SOURCE_DIR@\robotology\icub-tests\suites"
set "YARP_DATA_DIRS=%YARP_DATA_DIRS%;@PROJECT_SOURCE_DIR_NATIVE_PATH@\src\icub-tests\suites"
set "BLOCKTEST_RESOURCE_PATH"=%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%\bin
@endcmakeif ROBOTOLOGY_ENABLE_ROBOT_TESTING

Expand Down
2 changes: 1 addition & 1 deletion cmake/template/setup.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export GAZEBO_MODEL_PATH=${GAZEBO_MODEL_PATH:+${GAZEBO_MODEL_PATH}:}${ROBOTOLOGY

@cmakeif ROBOTOLOGY_ENABLE_ROBOT_TESTING
export @SHLIB_ENV_VAR@=$@SHLIB_ENV_VAR@:$ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX/lib/robottestingframework
export YARP_DATA_DIRS=$YARP_DATA_DIRS:@PROJECT_SOURCE_DIR@/robotology/icub-tests/suites
export YARP_DATA_DIRS=$YARP_DATA_DIRS:@PROJECT_SOURCE_DIR_SETUP_SH@/src/icub-tests/suites
export BLOCKTEST_RESOURCE_PATH=${ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX}/bin
@endcmakeif ROBOTOLOGY_ENABLE_ROBOT_TESTING

Expand Down