Skip to content

Commit ee64295

Browse files
committed
Fix unit tests execution with python 3
1 parent 2dec3a3 commit ee64295

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ addons:
8181
- cmake
8282
- swig
8383
- python3-dev
84-
- python3-nose2
84+
- python3-nose
8585
- python3
8686
- freeglut3-dev
8787

tools/travis/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ cd ${AVTRANSCODER_BUILD_PATH}
1313
export CMAKE_PREFIX_PATH=${DEPENDENCY_INSTALL_PATH}
1414

1515
# 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}
1717
make -k
1818
make install

tools/travis/python.nosetests.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -x
55

66
# Get avtranscoder library
77
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
99

1010
# Get assets
1111
git clone https://github.com/avTranscoder/avTranscoder-data.git
@@ -20,4 +20,4 @@ export AVTRANSCODER_TEST_IMAGE_PNG_FILE=`pwd`/avTranscoder-data/image/BigBuckBun
2020
export AVTRANSCODER_TEST_IMAGE_JPG_FILE=`pwd`/avTranscoder-data/image/BigBuckBunny/title_anouncement.thumbnail.jpg
2121

2222
# 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

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy