aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde2017-01-08 21:33:23 +0100
committerRémi Verschelde2017-01-08 21:33:37 +0100
commit8b7a86ec7b7bc4bb115f45545aa062cba47022bc (patch)
treea5e904e935bf54ef3a8e61c485b0f8e2a3d96a62
parent5bfa4227b309062b3ec9651a5d0c1e560a3f9863 (diff)
downloadgodot-8b7a86ec7b7bc4bb115f45545aa062cba47022bc.tar.gz
godot-8b7a86ec7b7bc4bb115f45545aa062cba47022bc.tar.zst
godot-8b7a86ec7b7bc4bb115f45545aa062cba47022bc.zip
Move tests again from core to main
As advised by @reduz, as tests depend on other libs.
-rw-r--r--core/SCsub1
-rw-r--r--main/SCsub2
-rw-r--r--main/main.cpp2
-rw-r--r--main/tests/SCsub (renamed from core/tests/SCsub)0
-rw-r--r--main/tests/test_containers.cpp (renamed from core/tests/test_containers.cpp)0
-rw-r--r--main/tests/test_containers.h (renamed from core/tests/test_containers.h)0
-rw-r--r--main/tests/test_gdscript.cpp (renamed from core/tests/test_gdscript.cpp)0
-rw-r--r--main/tests/test_gdscript.h (renamed from core/tests/test_gdscript.h)0
-rw-r--r--main/tests/test_gui.cpp (renamed from core/tests/test_gui.cpp)0
-rw-r--r--main/tests/test_gui.h (renamed from core/tests/test_gui.h)0
-rw-r--r--main/tests/test_image.cpp (renamed from core/tests/test_image.cpp)0
-rw-r--r--main/tests/test_image.h (renamed from core/tests/test_image.h)0
-rw-r--r--main/tests/test_io.cpp (renamed from core/tests/test_io.cpp)0
-rw-r--r--main/tests/test_io.h (renamed from core/tests/test_io.h)0
-rw-r--r--main/tests/test_main.cpp (renamed from core/tests/test_main.cpp)0
-rw-r--r--main/tests/test_main.h (renamed from core/tests/test_main.h)0
-rw-r--r--main/tests/test_math.cpp (renamed from core/tests/test_math.cpp)0
-rw-r--r--main/tests/test_math.h (renamed from core/tests/test_math.h)0
-rw-r--r--main/tests/test_physics.cpp (renamed from core/tests/test_physics.cpp)0
-rw-r--r--main/tests/test_physics.h (renamed from core/tests/test_physics.h)0
-rw-r--r--main/tests/test_physics_2d.cpp (renamed from core/tests/test_physics_2d.cpp)0
-rw-r--r--main/tests/test_physics_2d.h (renamed from core/tests/test_physics_2d.h)0
-rw-r--r--main/tests/test_render.cpp (renamed from core/tests/test_render.cpp)0
-rw-r--r--main/tests/test_render.h (renamed from core/tests/test_render.h)0
-rw-r--r--main/tests/test_shader_lang.cpp (renamed from core/tests/test_shader_lang.cpp)0
-rw-r--r--main/tests/test_shader_lang.h (renamed from core/tests/test_shader_lang.h)0
-rw-r--r--main/tests/test_sound.cpp (renamed from core/tests/test_sound.cpp)0
-rw-r--r--main/tests/test_sound.h (renamed from core/tests/test_sound.h)0
-rw-r--r--main/tests/test_string.cpp (renamed from core/tests/test_string.cpp)0
-rw-r--r--main/tests/test_string.h (renamed from core/tests/test_string.h)0
30 files changed, 3 insertions, 2 deletions
diff --git a/core/SCsub b/core/SCsub
index 7e30cfa14..8d89f6427 100644
--- a/core/SCsub
+++ b/core/SCsub
@@ -61,7 +61,6 @@ SConscript('os/SCsub')
SConscript('math/SCsub')
SConscript('io/SCsub')
SConscript('bind/SCsub')
-SConscript('tests/SCsub')
lib = env.Library("core", env.core_sources)
diff --git a/main/SCsub b/main/SCsub
index a83563f44..a09b7c439 100644
--- a/main/SCsub
+++ b/main/SCsub
@@ -7,6 +7,8 @@ env.add_source_files(env.main_sources, "*.cpp")
Export('env')
+SConscript('tests/SCsub')
+
lib = env.Library("main", env.main_sources)
env.Prepend(LIBS=[lib])
diff --git a/main/main.cpp b/main/main.cpp
index e3827b9ba..8d8aa9b5c 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -47,7 +47,7 @@
#include "script_language.h"
#include "io/resource_loader.h"
-#include "core/tests/test_main.h"
+#include "main/tests/test_main.h"
#include "os/dir_access.h"
#include "core/io/ip.h"
#include "scene/resources/packed_scene.h"
diff --git a/core/tests/SCsub b/main/tests/SCsub
index 03495c064..03495c064 100644
--- a/core/tests/SCsub
+++ b/main/tests/SCsub
diff --git a/core/tests/test_containers.cpp b/main/tests/test_containers.cpp
index 4bc297d0b..4bc297d0b 100644
--- a/core/tests/test_containers.cpp
+++ b/main/tests/test_containers.cpp
diff --git a/core/tests/test_containers.h b/main/tests/test_containers.h
index 72d5c0ff7..72d5c0ff7 100644
--- a/core/tests/test_containers.h
+++ b/main/tests/test_containers.h
diff --git a/core/tests/test_gdscript.cpp b/main/tests/test_gdscript.cpp
index 1ee27ec66..1ee27ec66 100644
--- a/core/tests/test_gdscript.cpp
+++ b/main/tests/test_gdscript.cpp
diff --git a/core/tests/test_gdscript.h b/main/tests/test_gdscript.h
index 225654e2a..225654e2a 100644
--- a/core/tests/test_gdscript.h
+++ b/main/tests/test_gdscript.h
diff --git a/core/tests/test_gui.cpp b/main/tests/test_gui.cpp
index bfce03d66..bfce03d66 100644
--- a/core/tests/test_gui.cpp
+++ b/main/tests/test_gui.cpp
diff --git a/core/tests/test_gui.h b/main/tests/test_gui.h
index 5526320b0..5526320b0 100644
--- a/core/tests/test_gui.h
+++ b/main/tests/test_gui.h
diff --git a/core/tests/test_image.cpp b/main/tests/test_image.cpp
index bf9851cf0..bf9851cf0 100644
--- a/core/tests/test_image.cpp
+++ b/main/tests/test_image.cpp
diff --git a/core/tests/test_image.h b/main/tests/test_image.h
index 09b33e799..09b33e799 100644
--- a/core/tests/test_image.h
+++ b/main/tests/test_image.h
diff --git a/core/tests/test_io.cpp b/main/tests/test_io.cpp
index 42664e73c..42664e73c 100644
--- a/core/tests/test_io.cpp
+++ b/main/tests/test_io.cpp
diff --git a/core/tests/test_io.h b/main/tests/test_io.h
index c839590ab..c839590ab 100644
--- a/core/tests/test_io.h
+++ b/main/tests/test_io.h
diff --git a/core/tests/test_main.cpp b/main/tests/test_main.cpp
index 1f7f2d7dd..1f7f2d7dd 100644
--- a/core/tests/test_main.cpp
+++ b/main/tests/test_main.cpp
diff --git a/core/tests/test_main.h b/main/tests/test_main.h
index c8d571a7d..c8d571a7d 100644
--- a/core/tests/test_main.h
+++ b/main/tests/test_main.h
diff --git a/core/tests/test_math.cpp b/main/tests/test_math.cpp
index b3b70986c..b3b70986c 100644
--- a/core/tests/test_math.cpp
+++ b/main/tests/test_math.cpp
diff --git a/core/tests/test_math.h b/main/tests/test_math.h
index 492c3a183..492c3a183 100644
--- a/core/tests/test_math.h
+++ b/main/tests/test_math.h
diff --git a/core/tests/test_physics.cpp b/main/tests/test_physics.cpp
index b1a7af8da..b1a7af8da 100644
--- a/core/tests/test_physics.cpp
+++ b/main/tests/test_physics.cpp
diff --git a/core/tests/test_physics.h b/main/tests/test_physics.h
index 5b6a54f2d..5b6a54f2d 100644
--- a/core/tests/test_physics.h
+++ b/main/tests/test_physics.h
diff --git a/core/tests/test_physics_2d.cpp b/main/tests/test_physics_2d.cpp
index 39b4e7edd..39b4e7edd 100644
--- a/core/tests/test_physics_2d.cpp
+++ b/main/tests/test_physics_2d.cpp
diff --git a/core/tests/test_physics_2d.h b/main/tests/test_physics_2d.h
index e2eb1f402..e2eb1f402 100644
--- a/core/tests/test_physics_2d.h
+++ b/main/tests/test_physics_2d.h
diff --git a/core/tests/test_render.cpp b/main/tests/test_render.cpp
index 51e136607..51e136607 100644
--- a/core/tests/test_render.cpp
+++ b/main/tests/test_render.cpp
diff --git a/core/tests/test_render.h b/main/tests/test_render.h
index 6993e75b9..6993e75b9 100644
--- a/core/tests/test_render.h
+++ b/main/tests/test_render.h
diff --git a/core/tests/test_shader_lang.cpp b/main/tests/test_shader_lang.cpp
index 1a677bcbe..1a677bcbe 100644
--- a/core/tests/test_shader_lang.cpp
+++ b/main/tests/test_shader_lang.cpp
diff --git a/core/tests/test_shader_lang.h b/main/tests/test_shader_lang.h
index f129fb224..f129fb224 100644
--- a/core/tests/test_shader_lang.h
+++ b/main/tests/test_shader_lang.h
diff --git a/core/tests/test_sound.cpp b/main/tests/test_sound.cpp
index 44cc117e0..44cc117e0 100644
--- a/core/tests/test_sound.cpp
+++ b/main/tests/test_sound.cpp
diff --git a/core/tests/test_sound.h b/main/tests/test_sound.h
index 91b87a226..91b87a226 100644
--- a/core/tests/test_sound.h
+++ b/main/tests/test_sound.h
diff --git a/core/tests/test_string.cpp b/main/tests/test_string.cpp
index d99ad4476..d99ad4476 100644
--- a/core/tests/test_string.cpp
+++ b/main/tests/test_string.cpp
diff --git a/core/tests/test_string.h b/main/tests/test_string.h
index 7b3cd9a01..7b3cd9a01 100644
--- a/core/tests/test_string.h
+++ b/main/tests/test_string.h