Skip to content
Draft
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
7 changes: 6 additions & 1 deletion .github/workflows/alpine-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@ jobs:
run: apk add --no-cache build-base cmake linux-headers git
- uses: actions/checkout@v6
- name: configure
run: mkdir build && cd build && cmake .. -DBUILDING_TESTS=1 -DCMAKE_COMPILE_WARNING_AS_ERROR=ON
run: >
mkdir build &&
cd build &&
cmake ..
-DBUILDING_TESTS=1
-DCMAKE_COMPILE_WARNING_AS_ERROR=ON
- name: build
run: cmake --build build --config Debug
- name: test
Expand Down
21 changes: 20 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,29 +12,46 @@ jobs:
build:
timeout-minutes: 60
runs-on: ubuntu-latest
name: build (${{matrix.env.URSIM_VERSION}}-${{matrix.env.ROBOT_MODEL}})
name: build ${{matrix.env.cc}}(${{matrix.env.URSIM_VERSION}}-${{matrix.env.ROBOT_MODEL}})
strategy:
fail-fast: false
matrix:
env:
- ROBOT_MODEL: 'ur5'
URSIM_VERSION: '3.14.3'
PROGRAM_FOLDER: 'tests/resources/dockerursim/programs/cb3'
cc: gcc
cxx: g++
- ROBOT_MODEL: 'ur5e'
URSIM_VERSION: '5.9.4'
PROGRAM_FOLDER: 'tests/resources/dockerursim/programs/e-series'
cc: gcc
cxx: g++
- ROBOT_MODEL: 'ur20'
URSIM_VERSION: 'latest'
PROGRAM_FOLDER: 'tests/resources/dockerursim/programs/e-series'
cc: gcc
cxx: g++
- ROBOT_MODEL: 'ur16e'
URSIM_VERSION: '5.12.6'
PROGRAM_FOLDER: 'tests/resources/dockerursim/programs/e-series'
cc: clang
cxx: clang++
- ROBOT_MODEL: 'ur5e'
URSIM_VERSION: '10.7.0'
PROGRAM_FOLDER: 'tests/resources/dockerursim/programs/polyscopex'
cc: gcc
cxx: g++
- ROBOT_MODEL: 'ur5e'
URSIM_VERSION: '10.11.0'
PROGRAM_FOLDER: 'tests/resources/dockerursim/programs/polyscopex'
cc: gcc
cxx: g++
- ROBOT_MODEL: 'ur5e'
URSIM_VERSION: '10.12.0'
PROGRAM_FOLDER: 'tests/resources/dockerursim/programs/polyscopex'
cc: gcc
cxx: g++

steps:
- uses: actions/checkout@v6
Expand Down Expand Up @@ -67,6 +84,8 @@ jobs:
-DWITH_ASAN=ON
-DPRIMARY_CLIENT_STRICT_PARSING=ON
-DCMAKE_COMPILE_WARNING_AS_ERROR=ON
-DCMAKE_C_COMPILER=${{ matrix.env.cc }}
-DCMAKE_CXX_COMPILER=${{ matrix.env.cxx }}
env:
CXXFLAGS: -g -O2 -fprofile-arcs -ftest-coverage
CFLAGS: -g -O2 -fprofile-arcs -ftest-coverage
Expand Down
2 changes: 1 addition & 1 deletion tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ include(FetchContent)
FetchContent_Declare(
googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG v1.15.2
GIT_TAG v1.17.0
)
# For Windows: Prevent overriding the parent project's compiler/linker settings
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
Expand Down
6 changes: 3 additions & 3 deletions tests/fake_rtde_server.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ class RTDEServer

std::thread send_thread_;

virtual void connectionCallback(const socket_t filedescriptor);
void connectionCallback(const socket_t filedescriptor);

virtual void disconnectionCallback(const socket_t filedescriptor);
void disconnectionCallback(const socket_t filedescriptor);

virtual void messageCallback(const socket_t filedescriptor, char* buffer, int nbytesrecv);
void messageCallback(const socket_t filedescriptor, char* buffer, int nbytesrecv);

void sendDataLoop();
std::atomic<bool> send_loop_running_;
Expand Down
8 changes: 8 additions & 0 deletions tests/test_deprecated_ur_driver_construction.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,14 @@
#include <thread>
#include "ur_client_library/ur/ur_driver.h"

// This file adds tests for deprecated constructors of UrDriver. To avoid a compiler warning in CI
// we suppress the warning inside this file / compilation unit.
#ifdef _MSC_VER
# pragma warning(disable : 4996)
#else
# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif

const std::string SCRIPT_FILE = "../resources/external_control.urscript";
const std::string OUTPUT_RECIPE = "resources/rtde_output_recipe.txt";
const std::string INPUT_RECIPE = "resources/rtde_input_recipe.txt";
Expand Down
Loading