Commitee64295

committed

Fix unit tests execution with python 3

1 parent2dec3a3 commitee64295Copy full SHA for ee64295

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ 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} -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DCMAKE_BUILD_TYPE=Release -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=3.5 -DAVTRANSCODER_COVERAGE=${ENABLE_COVERAGE}`
`17`	`17`	`make -k`
`18`	`18`	`make install`

Lines changed: 2 additions & 2 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,4 +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`		`-python3 nose2 --start-dir${TRAVIS_BUILD_DIR}/test/pyTest --with-coverage> progress.txt`
	`23`	`+nosetests3 -w${TRAVIS_BUILD_DIR}/test/pyTest --with-coverage> progress.txt`

Comments

(0)