Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverts the 2017 Image for Beta 1 (#264)

Browse Source 
* Revert "Updated the rpath to point to the correct location for the Java integration tests. (#262)"

This reverts commit c313dde03a.

* Revert "Update image 2017 v5 (#254)"

This reverts commit 8d1c51b7e9.
This commit is contained in:
Thad House
2016-10-12 19:52:49 -07:00
committed by Fred Silberberg
parent 27bf94fd06
commit f1c2b66569
169 changed files with 2410 additions and 1004 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test-scripts/run-tests-on-robot.sh
View File

@@ -173,7 +173,7 @@ enableIn10Seconds&
RUN_COMMAND=none
if [[ ${LANGUAGE} = java ]]; then
chmod a+x ${DEFAULT_JAVA_TEST_NAME}
RUN_COMMAND="env LD_LIBRARY_PATH=/opt/GenICam_v3_0_NI/bin/Linux32_ARM/ ${DEFAULT_PATH_TO_JRE} -ea -jar ${DEFAULT_JAVA_TEST_NAME} ${TEST_RUN_ARGS}"
RUN_COMMAND="env LD_LIBRARY_PATH=/usr/local/frc/rpath-lib/ ${DEFAULT_PATH_TO_JRE} -ea -jar ${DEFAULT_JAVA_TEST_NAME} ${TEST_RUN_ARGS}"
elif [[ ${LANGUAGE} = cpp ]]; then
chmod a+x ${DEFAULT_CPP_TEST_NAME}
RUN_COMMAND="./${DEFAULT_CPP_TEST_NAME} ${TEST_RUN_ARGS}"