cocos2d/cocos2d-x — pull request #6146 by shujunqiao (2014-04-04 10:26:45+00:00)
Title: modify Autotest.py

[ci skip].
modify ShaderTest and TouchesTest for not crash in autotest.
modify autotest.py , now is run mac autotest, (because it's need long time so cancel android autotest now).