Merge pull request #13292 from natural-law/v3

[ci skip] Add copy resources config of js-tests for web platform.
2015-08-10 15:09:33 +08:00 · 2015-08-10 15:09:33 +08:00 · 940b53e271
parent 1471936c2f f91908d651
commit 940b53e271
2 changed files with 12 additions and 2 deletions
--- a/tests/js-tests/.cocos-project.json
+++ b/tests/js-tests/.cocos-project.json
@ -25,7 +25,17 @@
    "web_cfg": {
        "project_path": "",
        "run_root_dir": "../../",
-        "sub_url": "/tests/js-tests/"
+        "sub_url": "/tests/js-tests/",
+        "copy_resources": [
+            {
+                "from": "../cpp-tests/Resources/", 
+                "to": "res/"
+            },
+            {
+                "from": "resjs", 
+                "to": "res/"
+            }
+        ]
    },
    "linux_cfg": {
        "project_path": "project/proj.linux",
--- a/tools/cocos2d-console
+++ b/tools/cocos2d-console
@ -1 +1 @@
-Subproject commit 562bccdac8519d4ee1b8d958dd43cb1d084c7059
+Subproject commit 85f71258c4f8fcba16ac5117c8047573e1680fd3