Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

modify android-job in autotest.py.

This commit is contained in:
CocosRobot 2014-03-18 16:21:41 +08:00
parent e80b152045
commit ee0e43fcc2
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/jenkins-scripts/autotest.py
View File

@ -6,7 +6,7 @@ import socket
import time import time
HOST_MAC = 'localhost' HOST_MAC = 'localhost'
HOST_ADNROID = '10.10.30.64' HOST_ADNROID = '10.10.40.64'
HOST_IOS = '10.10.30.61' HOST_IOS = '10.10.30.61'
PORT = 5678 PORT = 5678
@ -105,12 +105,19 @@ def ANDROID_BUILD():
def buildProj(): def buildProj():
infoBuild = os.system('./build/android-build.py -p 13 cpp-tests') infoBuild = os.system('./build/android-build.py -p 13 cpp-tests')
print 'infoBuild cpp_tests: ', infoBuild print 'infoBuild cpp_tests: ', infoBuild
infoBuild = os.system('ant -buildfile '+PATH_ANDROID_SRC+' debug install') infoBuild = os.system('ant -buildfile '+PATH_ANDROID_SRC+' debug')
print 'infoBuild: ', infoBuild print 'infoBuild: ', infoBuild
if infoBuild != 0: if infoBuild != 0:
print 'build **BUILD FAILED**' print 'build **BUILD FAILED**'
time.sleep(sleep_time) time.sleep(sleep_time)
return infoBuild return infoBuild
def installProj():
cmd = 'adb install '+PATH_ANDROID_SRC+'bin/CppTests-debug.apk'
infoInstall = os.system(cmd)
print 'infoInstall:', infoInstall
if infoInstall != 0:
print 'install **INSTALL FAILED**'
return infoInstall
def openProj(): def openProj():
cmd = 'adb shell am start -n org.cocos2dx.cpp_tests/org.cocos2dx.cpp_tests.Cocos2dxActivity' cmd = 'adb shell am start -n org.cocos2dx.cpp_tests/org.cocos2dx.cpp_tests.Cocos2dxActivity'
print 'cmd: ', cmd print 'cmd: ', cmd
@ -126,6 +133,7 @@ def ANDROID_BUILD():
cleanProj() cleanProj()
updateProperty() updateProperty()
buildProj() buildProj()
installProj()
return openProj() return openProj()
return buildAndRun() return buildAndRun()
#----------------autotest-android build and run end----------------# #----------------autotest-android build and run end----------------#