Commit1c95f19

committed

Travis: use Python3 for unit tests

1 parentc2106bd commit1c95f19Copy full SHA for 1c95f19

File tree

+12

-6

lines changed

+12

-6

lines changed

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ matrix:`
`62`	`62`	`env:DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.4.2 ENABLE_COVERAGE=true`
`63`	`63`	`allow_failures:`
`64`	`64`	`# build with libav`
	`65`	`+ -os:osx`
`65`	`66`	`-env:DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=true`
`66`	`67`	`-env:DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=false`
`67`	`68`	`# build with ffmpeg-2.8.6`
`@@ -80,8 +81,10 @@ addons:`
`80`	`81`	`packages:`
`81`	`82`	`-cmake`
`82`	`83`	`-swig`
`83`		`- -python-dev`
`84`		`- -python-nose`
	`84`	`+ -python3-dev`
	`85`	`+ -python3`
	`86`	`+ -python3-nose`
	`87`	`+ -python3-coverage`
`85`	`88`	`-freeglut3-dev`
`86`	`89`
`87`	`90`	`cache:`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,10 @@ cd ${AVTRANSCODER_BUILD_PATH}`
`13`	`13`	`export CMAKE_PREFIX_PATH=${DEPENDENCY_INSTALL_PATH}`
`14`	`14`
`15`	`15`	`# Build avTranscoder`
`16`		`-cmake .. -DCMAKE_INSTALL_PREFIX=${AVTRANSCODER_INSTALL_PATH} -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DCMAKE_BUILD_TYPE=Release -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=2.7 -DAVTRANSCODER_COVERAGE=${ENABLE_COVERAGE}`
	`16`	`+cmake .. -DCMAKE_INSTALL_PREFIX=${AVTRANSCODER_INSTALL_PATH} \`
	`17`	`+ -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH \`
	`18`	`+ -DCMAKE_BUILD_TYPE=Release \`
	`19`	`+ -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=3.5 \`
	`20`	`+ -DAVTRANSCODER_COVERAGE=${ENABLE_COVERAGE}`
`17`	`21`	`make -k`
`18`	`22`	`make install`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ set -x`
`5`	`5`
`6`	`6`	`# Get avtranscoder library`
`7`	`7`	`export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${DEPENDENCY_INSTALL_PATH}/lib`
`8`		`-export PYTHONPATH=${AVTRANSCODER_INSTALL_PATH}/lib/python2.7/site-packages/:$PYTHONPATH`
	`8`	`+export PYTHONPATH=${AVTRANSCODER_INSTALL_PATH}/lib/python3.5/site-packages/:$PYTHONPATH`
`9`	`9`
`10`	`10`	`# Get assets`
`11`	`11`	`git clone https://github.com/avTranscoder/avTranscoder-data.git`
@@ -20,5 +20,4 @@ export AVTRANSCODER_TEST_IMAGE_PNG_FILE=`pwd`/avTranscoder-data/image/BigBuckBun
`20`	`20`	export AVTRANSCODER_TEST_IMAGE_JPG_FILE=`pwd`/avTranscoder-data/image/BigBuckBunny/title_anouncement.thumbnail.jpg
`21`	`21`
`22`	`22`	`# Launch tests`
`23`		`-nosetests${TRAVIS_BUILD_DIR}/test/pyTest --with-coverage> progress.txt`
`24`		`-`
	`23`	`+nosetests3 -w${TRAVIS_BUILD_DIR}/test/pyTest --with-coverage --nocapture --verbose> progress.txt`

Comments

(0)