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

Disable libcurl tests for Emscripten.

This commit is contained in:
James Gregory 2013-04-08 19:13:22 -07:00
parent dd9e82c068
commit 905725184d
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/Cpp/TestCpp/Classes/controller.cpp
View File

@ -87,7 +87,7 @@ static TestScene* CreateTestScene(int nIdx)
case TEST_ZWOPTEX: case TEST_ZWOPTEX:
pScene = new ZwoptexTestScene(); break; pScene = new ZwoptexTestScene(); break;
// bada don't support libcurl // bada don't support libcurl
#if (CC_TARGET_PLATFORM != CC_PLATFORM_BADA && CC_TARGET_PLATFORM != CC_PLATFORM_NACL && CC_TARGET_PLATFORM != CC_PLATFORM_MARMALADE) #if (CC_TARGET_PLATFORM != CC_PLATFORM_BADA && CC_TARGET_PLATFORM != CC_PLATFORM_NACL && CC_TARGET_PLATFORM != CC_PLATFORM_MARMALADE && CC_TARGET_PLATFORM != CC_PLATFORM_EMSCRIPTEN)
case TEST_CURL: case TEST_CURL:
pScene = new CurlTestScene(); break; pScene = new CurlTestScene(); break;
#endif #endif

4
samples/Cpp/TestCpp/Classes/tests.h
View File

@ -32,12 +32,14 @@
#include "PerformanceTest/PerformanceTest.h" #include "PerformanceTest/PerformanceTest.h"
#include "ZwoptexTest/ZwoptexTest.h" #include "ZwoptexTest/ZwoptexTest.h"
#include "CocosDenshionTest/CocosDenshionTest.h" #include "CocosDenshionTest/CocosDenshionTest.h"
#if (CC_TARGET_PLATFORM != CC_PLATFORM_EMSCRIPEN)
#if (CC_TARGET_PLATFORM != CC_PLATFORM_MARMALADE) #if (CC_TARGET_PLATFORM != CC_PLATFORM_MARMALADE)
// bada don't support libcurl // bada don't support libcurl
#if (CC_TARGET_PLATFORM != CC_PLATFORM_BADA) #if (CC_TARGET_PLATFORM != CC_PLATFORM_BADA)
#include "CurlTest/CurlTest.h" #include "CurlTest/CurlTest.h"
#endif #endif
#endif #endif
#endif
#include "UserDefaultTest/UserDefaultTest.h" #include "UserDefaultTest/UserDefaultTest.h"
#include "BugsTest/BugsTest.h" #include "BugsTest/BugsTest.h"
#include "Texture2dTest/Texture2dTest.h" #include "Texture2dTest/Texture2dTest.h"
@ -149,10 +151,12 @@ const std::string g_aTestNames[TESTS_COUNT] = {
"CocosDenshionTest", "CocosDenshionTest",
"PerformanceTest", "PerformanceTest",
"ZwoptexTest", "ZwoptexTest",
#if (CC_TARGET_PLATFORM != CC_PLATFORM_EMSCRIPTEN)
#if (CC_TARGET_PLATFORM != CC_PLATFORM_MARMALADE) #if (CC_TARGET_PLATFORM != CC_PLATFORM_MARMALADE)
#if (CC_TARGET_PLATFORM != CC_PLATFORM_BADA) #if (CC_TARGET_PLATFORM != CC_PLATFORM_BADA)
"CurlTest", "CurlTest",
#endif #endif
#endif
#endif #endif
"UserDefaultTest", "UserDefaultTest",
"BugsTest", "BugsTest",