Skip to content

Commit

Permalink
PR IntelRealSense#13292 from noacoohen: Remove legacy live tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Nir-Az authored Aug 29, 2024
2 parents 59fbc45 + 42ae4ee commit 47ad794
Show file tree
Hide file tree
Showing 15 changed files with 4 additions and 9,781 deletions.
77 changes: 2 additions & 75 deletions .github/workflows/buildsCI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ jobs:
#--------------------------------------------------------------------------------
U20_U24_ST_Py_EX_CfU_LiveTest: # Ubuntu, Static, Python, Examples & Tools, Check for Updates, Legacy Live-Tests
U20_U24_ST_Py_EX_CfU_LiveTest: # Ubuntu, Static, Python, Examples & Tools, Check for Updates
runs-on: ${{ matrix.os }}
strategy:
matrix:
Expand Down Expand Up @@ -291,7 +291,7 @@ jobs:
shell: bash
run: |
cd build
cmake .. -DCMAKE_BUILD_TYPE=${{env.LRS_RUN_CONFIG}} -DBUILD_SHARED_LIBS=false -DBUILD_EXAMPLES=true -DBUILD_TOOLS=true -DCHECK_FOR_UPDATES=true -DBUILD_LEGACY_LIVE_TEST=true -DBUILD_PYTHON_BINDINGS=true -DPYTHON_EXECUTABLE=$(which python3)
cmake .. -DCMAKE_BUILD_TYPE=${{env.LRS_RUN_CONFIG}} -DBUILD_SHARED_LIBS=false -DBUILD_EXAMPLES=true -DBUILD_TOOLS=true -DCHECK_FOR_UPDATES=true -DBUILD_PYTHON_BINDINGS=true -DPYTHON_EXECUTABLE=$(which python3)
cmake --build . -- -j4
- name: Test
Expand Down Expand Up @@ -469,79 +469,6 @@ jobs:
shell: bash
run: |
python3 unit-tests/run-unit-tests.py --no-color --debug --stdout --not-live --context "dds linux" --tag dds

#--------------------------------------------------------------------------------
U22_U24_SH_RSUSB_LiveTest: # Ubuntu, Shared, Legacy live-tests
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-22.04, ubuntu-24.04]
include:
- os: ubuntu-22.04
name: U22
- os: ubuntu-24.04
name: U24
name: ${{ matrix.name }}_SH_RSUSB_LiveTest
timeout-minutes: 60
env:
LRS_BUILD_NODEJS: true
steps:
- uses: actions/checkout@v4

- name: Check_API
shell: bash
run: |
cd scripts
./api_check.sh
cd ..
- name: Prebuild
shell: bash
run: |
set -x
mkdir build
sudo apt-get update;
sudo apt-get install -qq build-essential xorg-dev libgl1-mesa-dev libglu1-mesa-dev libglew-dev libglm-dev;
sudo apt-get install -qq libusb-1.0-0-dev;
sudo apt-get install -qq libgtk-3-dev;
sudo apt-get install libglfw3-dev libglfw3;
- name: Build
shell: bash
run: |
cd build
cmake .. -DCMAKE_BUILD_TYPE=${{env.LRS_BUILD_CONFIG}} -DBUILD_SHARED_LIBS=true -DBUILD_EXAMPLES=false -DBUILD_TOOLS=false -DCHECK_FOR_UPDATES=false -DFORCE_RSUSB_BACKEND=true -DBUILD_LEGACY_LIVE_TEST=true
cmake --build . -- -j4
- name: Test
shell: bash
id: test-step
# We set continue-on-error: true as a workaround for not skipping the upload log step on failure,
# The final step will check the return value from the test step and decide if to fail/pass the job
continue-on-error: true
run: |
export LRS_LOG_LEVEL="DEBUG";
cd build/${{env.LRS_BUILD_CONFIG}}/
./live-test -d yes -i [software-device]
- name: Upload RS log artifact
uses: actions/upload-artifact@v4
with:
name: Log file - ${{ matrix.name }}_SH_RSUSB_LiveTest
path: build/${{env.LRS_BUILD_CONFIG}}/*.log

- name: Provide correct exit status for job
shell: bash
run: |
if [ ${{steps.test-step.outcome}} = "failure" ];then
echo "Test step failed, please open it to view the reported issue"
exit 1
else
exit 0
fi
#--------------------------------------------------------------------------------
Mac_cpp:
Expand Down
1 change: 0 additions & 1 deletion CMake/android_config.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ macro(os_set_flags)
unset(UNIX)
unset(APPLE)
set(BUILD_UNIT_TESTS OFF)
set(BUILD_LEGACY_LIVE_TEST OFF)
set(BUILD_EXAMPLES OFF)
set(BUILD_TOOLS OFF)
set(BUILD_WITH_OPENMP OFF)
Expand Down
1 change: 0 additions & 1 deletion CMake/lrs_options.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ option(HWM_OVER_XU "Send HWM commands over UVC XU control" ON)
option(COM_MULTITHREADED "Set OFF to initialize COM library with COINIT_APARTMENTTHREADED (Windows only)" ON)
option(BUILD_SHARED_LIBS "Build shared library" ON)
option(BUILD_UNIT_TESTS "Build LibCI unit tests. If enabled, additional test data may be downloaded" OFF)
option(BUILD_LEGACY_LIVE_TEST "Build the live-test.exe test used in Travis. If enabled, additional test data may be downloaded" OFF)
option(BUILD_EXAMPLES "Build examples (not including graphical examples -- see BUILD_GRAPHICAL_EXAMPLES)" ON)
option(BUILD_GRAPHICAL_EXAMPLES "Build graphical examples (Viewer & DQT) -- Implies BUILD_GLSL_EXTENSIONS" ON)
option(BUILD_CV_EXAMPLES "Build OpenCV examples" OFF)
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ elseif(BUILD_TOOLS)
add_subdirectory(tools)
endif()

if(BUILD_UNIT_TESTS OR BUILD_LEGACY_LIVE_TEST)
if(BUILD_UNIT_TESTS)
include( CMake/external_catch2.cmake )
add_subdirectory(unit-tests)
endif()
Expand Down
4 changes: 1 addition & 3 deletions unit-tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,4 @@ if(BUILD_UNIT_TESTS)
endif()


if(BUILD_LEGACY_LIVE_TEST)
include(./live-test.cmake)
endif()

170 changes: 0 additions & 170 deletions unit-tests/live-test.cmake

This file was deleted.

Loading

0 comments on commit 47ad794

Please sign in to comment.