From f5fc716aba1265f115f3804c25c5cdab8b96e648 Mon Sep 17 00:00:00 2001 From: Ian Craggs Date: Thu, 31 May 2018 23:19:17 +0100 Subject: [PATCH] Use Python3 for mqttsas.py --- appveyor.yml | 7 +++---- travis-build.sh | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b12a15bd..08fa006d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,12 +5,11 @@ image: configuration: Debug install: - cmd: openssl version - - cmd: python --version - - cmd: netsh advfirewall firewall add rule name="Python 2.7" dir=in action=allow program="C:\Python27\python.exe" enable=yes + - cmd: C:\Python36\python --version + - cmd: netsh advfirewall firewall add rule name="Python 3.6" dir=in action=allow program="C:\Python36\python.exe" enable=yes - cmd: netsh advfirewall firewall add rule name="Open Port 1883" dir=in action=allow protocol=TCP localport=1883 - cmd: netsh advfirewall set allprofiles state off - - ps: Start-Process python -ArgumentList 'test\mqttsas.py' - - cmd: C:\Python36\python --version + - ps: Start-Process C:\Python36\python -ArgumentList 'test\mqttsas.py' - cmd: git clone https://github.com/eclipse/paho.mqtt.testing.git - cmd: cd paho.mqtt.testing\interoperability - ps: Start-Process C:\Python36\python -ArgumentList 'startbroker.py -c localhost_testing.conf' diff --git a/travis-build.sh b/travis-build.sh index 2fda3548..5ac6bfd5 100755 --- a/travis-build.sh +++ b/travis-build.sh @@ -8,7 +8,7 @@ cd build.paho echo "travis build dir $TRAVIS_BUILD_DIR pwd $PWD" cmake -DCMAKE_BUILD_TYPE=Debug -DPAHO_WITH_SSL=TRUE -DPAHO_BUILD_DOCUMENTATION=FALSE -DPAHO_BUILD_SAMPLES=TRUE .. make -python ../test/mqttsas.py & +python3 ../test/mqttsas.py & ctest -VV --timeout 600 cpack --verbose kill %1