diff --git a/tools/jenkins-scripts/do-pull-request-builder.py b/tools/jenkins-scripts/do-pull-request-builder.py index 6665ae31fe..d4dba509dd 100755 --- a/tools/jenkins-scripts/do-pull-request-builder.py +++ b/tools/jenkins-scripts/do-pull-request-builder.py @@ -37,14 +37,15 @@ def do_build_slaves(): global node_name jenkins_script_path = "tools" + os.sep + "jenkins-scripts" + os.sep + "slave-scripts" + os.sep + js_tests_build_scripts = "" if(branch != 'v1' and branch != 'v2'): slave_build_scripts = "" if(node_name == 'android') or (node_name == 'android_bak'): - # patch_cpp_empty_test() slave_build_scripts = jenkins_script_path + "android-build.sh" elif(node_name == 'win32' or node_name == 'win32_win7' or node_name == 'win32_bak'): slave_build_scripts = jenkins_script_path + "win32-build.bat" + js_tests_build_scripts = jenkins_script_path + "win32-js-build.bat" elif(node_name == 'windows-universal' or node_name == 'windows-universal_bak'): slave_build_scripts = jenkins_script_path + "windows-universal.bat" elif(node_name == 'ios_mac' or node_name == 'ios' or node_name == 'ios_bak'): @@ -58,6 +59,8 @@ def do_build_slaves(): slave_build_scripts = jenkins_script_path + "wp8-v3.bat" ret = os.system(slave_build_scripts) + js_test_ret = os.system(js_tests_build_scripts) + ret = ret + js_test_ret #get build result print "build finished and return " + str(ret) diff --git a/tools/jenkins-scripts/slave-scripts/win32-js-build.bat b/tools/jenkins-scripts/slave-scripts/win32-js-build.bat new file mode 100644 index 0000000000..4325164a05 --- /dev/null +++ b/tools/jenkins-scripts/slave-scripts/win32-js-build.bat @@ -0,0 +1,2 @@ +call "%VS120COMNTOOLS%vsvars32.bat" +msbuild build\cocos2d-js-win32.sln /t:Build /p:Platform="Win32" /p:Configuration="Release" /m