samples -> tests

CMakeLists.txt

@@ -279,13 +279,13 @@ add_subdirectory(external/lua/tolua)
 add_subdirectory(cocos/scripting)
 endif(BUILD_LIBS_LUA)
 
-# build samples
+# build tests 
 
 if(BUILD_TestCpp)
-add_subdirectory(samples/test-cpp)
+add_subdirectory(tests/test-cpp)
 endif(BUILD_TestCpp)
 
 if(BUILD_TestLua)
-add_subdirectory(samples/test-lua)
+add_subdirectory(tests/test-lua)
 endif(BUILD_TestLua)
 

build/android-build.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 # android-build.py
-# Build android samples
+# Build android 
 
 import sys
 import os, os.path
@@ -74,9 +74,9 @@ def select_toolchain_version():
 
 def caculate_built_samples(args):
     ''' Compute the sampels to be built
-    'cpp' for short of all cpp samples
-    'lua' for short of all lua smpleas
-    'jsb' for short of all javascript samples
+    'cpp' for short of all cpp tests
+    'lua' for short of all lua tests 
+    'jsb' for short of all javascript tests
     '''
 
     if 'all' in args:
@@ -204,11 +204,11 @@ def build_samples(target,ndk_build_param,android_platform,build_mode):
     app_android_root = ''
     for target in build_targets:
         if target == 'testcpp':
-            app_android_root = os.path.join(cocos_root, 'samples/test-cpp/proj.android')
+            app_android_root = os.path.join(cocos_root, 'tests/test-cpp/proj.android')
         elif target == 'testlua':
-            app_android_root = os.path.join(cocos_root, 'samples/test-lua/proj.android')
+            app_android_root = os.path.join(cocos_root, 'tests/test-lua/proj.android')
         elif target == 'testjavascript':
-            app_android_root = os.path.join(cocos_root, 'samples/test-javascript/proj.android')
+            app_android_root = os.path.join(cocos_root, 'tests/test-javascript/proj.android')
         else:
             print 'unknown target: %s' % target
             continue
@@ -221,13 +221,13 @@ if __name__ == '__main__':
 
     #parse the params
     usage = """
-    This script is mainy used for building samples built-in with cocos2d-x.
+    This script is mainy used for building tests built-in with cocos2d-x.
     
     Usage: %prog [options] target
 
     Valid targets are: [testcpp|testlua|testjavascript]. You can combine them arbitrarily with a whitespace among two valid targets.
 
-    You can use [all|cpp|lua|jsb], to build all the samples, or all the c++ samples, or all the lua samples, or all the jsb samples respectevely.
+    You can use [all|cpp|lua|jsb], to build all the tests, or all the c++ tests, or all the Lua tests, or all the JavaScript tests respectevely.
 
     cpp = ['testcpp']
     lua = ['testlua']
@@ -241,10 +241,10 @@ if __name__ == '__main__':
     //1. to build simplegame and assetsmanager 
     python android-build.py -p 10 testcpp testlua
 
-    //2. to build testlua and all the jsb samples
+    //2. to build testlua and all the jsb tests 
     python android-build.py -p 19 testlua jsb
 
-    Note: You should install ant to generate apk while building the andriod samples. But it is optional. You can generate apk with eclipse.
+    Note: You should install ant to generate apk while building the andriod tests. But it is optional. You can generate apk with eclipse.
     """
 
     parser = OptionParser(usage=usage)

build/cocos2d-win32.vc2012.sln

@@ -11,7 +11,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "..\external\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libExtensions", "..\extensions\proj.win32\libExtensions.vcxproj", "{21B2C324-891F-48EA-AD1A-5AE13DE12E28}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestCpp", "..\samples\test-cpp\proj.win32\TestCpp.vcxproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestCpp", "..\tests\test-cpp\proj.win32\TestCpp.vcxproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosBuilder", "..\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj", "{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}"
 EndProject
@@ -25,13 +25,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\cocos\editor
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libJSBinding", "..\cocos\scripting\javascript\bindings\proj.win32\libJSBinding.vcxproj", "{39379840-825A-45A0-B363-C09FFEF864BD}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestJavascript", "..\samples\test-javascript\proj.win32\TestJavascript.vcxproj", "{D0F06A44-A245-4D13-A498-0120C203B539}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestJavascript", "..\tests\test-javascript\proj.win32\TestJavascript.vcxproj", "{D0F06A44-A245-4D13-A498-0120C203B539}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libLocalStorage", "..\cocos\storage\local-storage\proj.win32\libLocalStorage.vcxproj", "{632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "..\cocos\scripting\lua\bindings\liblua.vcxproj", "{DDC3E27F-004D-4DD4-9DD3-931A013D2159}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLua", "..\samples\test-lua\proj.win32\TestLua.win32.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLua", "..\tests\test-lua\proj.win32\TestLua.win32.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libJSBindingForBuilder", "..\cocos\scripting\javascript\bindings\cocosbuilder\libJSBindingForBuilder.vcxproj", "{F9DA0FC1-651B-457B-962E-A4D61CEBF5FD}"
 EndProject

build/cocos2d_tests.xcodeproj/project.pbxproj.REMOVED.git-id

@@ -1 +1 @@
-af156a6a419e9139401d9d43c15e1966fd5d4881
+81c3c8eb1c11c14d0b7be9a188f7180df472b3bd

samples/test-javascript/tests

@@ -1 +0,0 @@
-Subproject commit 7a9a69a41480127a1572a4983eb9b5f1cbf2e186