fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-05-23 10:57:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

reenable pytest with px4-dev-ecl

Browse Source
This commit is contained in:
Daniel Agar
2018-01-05 01:50:38 -05:00
parent f407954207
commit 7df4e0f8eb
3 changed files with 17 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+3 -1
View File
@@ -1,3 +1,5 @@
*.DS_Store
Build/
*~
.cache/
Build/
EKF/tests/pytest/__pycache__/
EKF/CMakeLists.txt
-14
View File
@@ -95,20 +95,6 @@ if(PythonTests)
find_package(PythonLibs 3 REQUIRED)
find_package(PythonInterp 3 REQUIRED)
# Check for required python packages
file(READ "${CMAKE_SOURCE_DIR}/tests/pytest/requirements.txt" ECL_TEST_PYTHON_PACKAGES)
# Strip version information and split into cmake list
string(REGEX REPLACE "\n" ";" ECL_TEST_PYTHON_PACKAGES "${ECL_TEST_PYTHON_PACKAGES}")
string(REGEX REPLACE "-" "_" ECL_TEST_PYTHON_PACKAGES "${ECL_TEST_PYTHON_PACKAGES}")
string(REGEX REPLACE "[>=]+[^;]*" "" ECL_TEST_PYTHON_PACKAGES "${ECL_TEST_PYTHON_PACKAGES}")
foreach(package ${ECL_TEST_PYTHON_PACKAGES})
execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import ${package}" RESULT_VARIABLE PytestAvailable OUTPUT_QUIET ERROR_QUIET)
if(${PytestAvailable})
message(FATAL_ERROR "Python package missing:\n Please install ${package}, e.g., \"pip3 install --user ${package}\"")
endif()
endforeach(package)
# Need SWIG to wrap ecl
find_package(SWIG REQUIRED)
include(${SWIG_USE_FILE})
Jenkinsfile
Vendored
+14 -15
View File
@@ -35,21 +35,20 @@ pipeline {
}
}
//stage('pytest') {
// agent {
// docker {
// image 'px4io/px4-dev-base:2017-12-30'
// args '-e CI=true -e CCACHE_BASEDIR=$WORKSPACE -e CCACHE_DIR=/tmp/ccache -v /tmp/ccache:/tmp/ccache:rw'
// }
// }
// steps {
// sh 'git clean -ff -x -d .'
// sh 'git submodule deinit -f .'
// sh 'git submodule update --init --recursive'
// sh 'pip install --user -r ./EKF/tests/pytest/requirements.txt'
// sh './build.sh'
// }
//}
stage('pytest') {
agent {
docker {
image 'px4io/px4-dev-ecl'
args '-e CI=true -e CCACHE_BASEDIR=$WORKSPACE -e CCACHE_DIR=/tmp/ccache -v /tmp/ccache:/tmp/ccache:rw'
}
}
steps {
sh 'git clean -ff -x -d .'
sh 'git submodule deinit -f .'
sh 'git submodule update --init --recursive'
sh 'RUN_PYTEST=1 ./build.sh'
}
}
}
}