From 905725184de39cfec487d2478f0a38bff1faf551 Mon Sep 17 00:00:00 2001 From: James Gregory Date: Mon, 8 Apr 2013 19:13:22 -0700 Subject: [PATCH] Disable libcurl tests for Emscripten. --- samples/Cpp/TestCpp/Classes/controller.cpp | 2 +- samples/Cpp/TestCpp/Classes/tests.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/samples/Cpp/TestCpp/Classes/controller.cpp b/samples/Cpp/TestCpp/Classes/controller.cpp index 2b5a03a3e4..d0f0c48a46 100644 --- a/samples/Cpp/TestCpp/Classes/controller.cpp +++ b/samples/Cpp/TestCpp/Classes/controller.cpp @@ -87,7 +87,7 @@ static TestScene* CreateTestScene(int nIdx) case TEST_ZWOPTEX: pScene = new ZwoptexTestScene(); break; // 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: pScene = new CurlTestScene(); break; #endif diff --git a/samples/Cpp/TestCpp/Classes/tests.h b/samples/Cpp/TestCpp/Classes/tests.h index 1148abd605..26d00ca647 100644 --- a/samples/Cpp/TestCpp/Classes/tests.h +++ b/samples/Cpp/TestCpp/Classes/tests.h @@ -32,12 +32,14 @@ #include "PerformanceTest/PerformanceTest.h" #include "ZwoptexTest/ZwoptexTest.h" #include "CocosDenshionTest/CocosDenshionTest.h" +#if (CC_TARGET_PLATFORM != CC_PLATFORM_EMSCRIPEN) #if (CC_TARGET_PLATFORM != CC_PLATFORM_MARMALADE) // bada don't support libcurl #if (CC_TARGET_PLATFORM != CC_PLATFORM_BADA) #include "CurlTest/CurlTest.h" #endif #endif +#endif #include "UserDefaultTest/UserDefaultTest.h" #include "BugsTest/BugsTest.h" #include "Texture2dTest/Texture2dTest.h" @@ -149,10 +151,12 @@ const std::string g_aTestNames[TESTS_COUNT] = { "CocosDenshionTest", "PerformanceTest", "ZwoptexTest", +#if (CC_TARGET_PLATFORM != CC_PLATFORM_EMSCRIPTEN) #if (CC_TARGET_PLATFORM != CC_PLATFORM_MARMALADE) #if (CC_TARGET_PLATFORM != CC_PLATFORM_BADA) "CurlTest", #endif +#endif #endif "UserDefaultTest", "BugsTest",