From 8b7a86ec7b7bc4bb115f45545aa062cba47022bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sun, 8 Jan 2017 21:33:23 +0100 Subject: [PATCH] Move tests again from core to main As advised by @reduz, as tests depend on other libs. --- core/SCsub | 1 - main/SCsub | 2 ++ main/main.cpp | 2 +- {core => main}/tests/SCsub | 0 {core => main}/tests/test_containers.cpp | 0 {core => main}/tests/test_containers.h | 0 {core => main}/tests/test_gdscript.cpp | 0 {core => main}/tests/test_gdscript.h | 0 {core => main}/tests/test_gui.cpp | 0 {core => main}/tests/test_gui.h | 0 {core => main}/tests/test_image.cpp | 0 {core => main}/tests/test_image.h | 0 {core => main}/tests/test_io.cpp | 0 {core => main}/tests/test_io.h | 0 {core => main}/tests/test_main.cpp | 0 {core => main}/tests/test_main.h | 0 {core => main}/tests/test_math.cpp | 0 {core => main}/tests/test_math.h | 0 {core => main}/tests/test_physics.cpp | 0 {core => main}/tests/test_physics.h | 0 {core => main}/tests/test_physics_2d.cpp | 0 {core => main}/tests/test_physics_2d.h | 0 {core => main}/tests/test_render.cpp | 0 {core => main}/tests/test_render.h | 0 {core => main}/tests/test_shader_lang.cpp | 0 {core => main}/tests/test_shader_lang.h | 0 {core => main}/tests/test_sound.cpp | 0 {core => main}/tests/test_sound.h | 0 {core => main}/tests/test_string.cpp | 0 {core => main}/tests/test_string.h | 0 30 files changed, 3 insertions(+), 2 deletions(-) rename {core => main}/tests/SCsub (100%) rename {core => main}/tests/test_containers.cpp (100%) rename {core => main}/tests/test_containers.h (100%) rename {core => main}/tests/test_gdscript.cpp (100%) rename {core => main}/tests/test_gdscript.h (100%) rename {core => main}/tests/test_gui.cpp (100%) rename {core => main}/tests/test_gui.h (100%) rename {core => main}/tests/test_image.cpp (100%) rename {core => main}/tests/test_image.h (100%) rename {core => main}/tests/test_io.cpp (100%) rename {core => main}/tests/test_io.h (100%) rename {core => main}/tests/test_main.cpp (100%) rename {core => main}/tests/test_main.h (100%) rename {core => main}/tests/test_math.cpp (100%) rename {core => main}/tests/test_math.h (100%) rename {core => main}/tests/test_physics.cpp (100%) rename {core => main}/tests/test_physics.h (100%) rename {core => main}/tests/test_physics_2d.cpp (100%) rename {core => main}/tests/test_physics_2d.h (100%) rename {core => main}/tests/test_render.cpp (100%) rename {core => main}/tests/test_render.h (100%) rename {core => main}/tests/test_shader_lang.cpp (100%) rename {core => main}/tests/test_shader_lang.h (100%) rename {core => main}/tests/test_sound.cpp (100%) rename {core => main}/tests/test_sound.h (100%) rename {core => main}/tests/test_string.cpp (100%) rename {core => main}/tests/test_string.h (100%) diff --git a/core/SCsub b/core/SCsub index 7e30cfa1462..8d89f6427bb 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 a83563f44da..a09b7c4396e 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 e3827b9ba6d..8d8aa9b5cb3 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 similarity index 100% rename from core/tests/SCsub rename to main/tests/SCsub diff --git a/core/tests/test_containers.cpp b/main/tests/test_containers.cpp similarity index 100% rename from core/tests/test_containers.cpp rename to main/tests/test_containers.cpp diff --git a/core/tests/test_containers.h b/main/tests/test_containers.h similarity index 100% rename from core/tests/test_containers.h rename to main/tests/test_containers.h diff --git a/core/tests/test_gdscript.cpp b/main/tests/test_gdscript.cpp similarity index 100% rename from core/tests/test_gdscript.cpp rename to main/tests/test_gdscript.cpp diff --git a/core/tests/test_gdscript.h b/main/tests/test_gdscript.h similarity index 100% rename from core/tests/test_gdscript.h rename to main/tests/test_gdscript.h diff --git a/core/tests/test_gui.cpp b/main/tests/test_gui.cpp similarity index 100% rename from core/tests/test_gui.cpp rename to main/tests/test_gui.cpp diff --git a/core/tests/test_gui.h b/main/tests/test_gui.h similarity index 100% rename from core/tests/test_gui.h rename to main/tests/test_gui.h diff --git a/core/tests/test_image.cpp b/main/tests/test_image.cpp similarity index 100% rename from core/tests/test_image.cpp rename to main/tests/test_image.cpp diff --git a/core/tests/test_image.h b/main/tests/test_image.h similarity index 100% rename from core/tests/test_image.h rename to main/tests/test_image.h diff --git a/core/tests/test_io.cpp b/main/tests/test_io.cpp similarity index 100% rename from core/tests/test_io.cpp rename to main/tests/test_io.cpp diff --git a/core/tests/test_io.h b/main/tests/test_io.h similarity index 100% rename from core/tests/test_io.h rename to main/tests/test_io.h diff --git a/core/tests/test_main.cpp b/main/tests/test_main.cpp similarity index 100% rename from core/tests/test_main.cpp rename to main/tests/test_main.cpp diff --git a/core/tests/test_main.h b/main/tests/test_main.h similarity index 100% rename from core/tests/test_main.h rename to main/tests/test_main.h diff --git a/core/tests/test_math.cpp b/main/tests/test_math.cpp similarity index 100% rename from core/tests/test_math.cpp rename to main/tests/test_math.cpp diff --git a/core/tests/test_math.h b/main/tests/test_math.h similarity index 100% rename from core/tests/test_math.h rename to main/tests/test_math.h diff --git a/core/tests/test_physics.cpp b/main/tests/test_physics.cpp similarity index 100% rename from core/tests/test_physics.cpp rename to main/tests/test_physics.cpp diff --git a/core/tests/test_physics.h b/main/tests/test_physics.h similarity index 100% rename from core/tests/test_physics.h rename to main/tests/test_physics.h diff --git a/core/tests/test_physics_2d.cpp b/main/tests/test_physics_2d.cpp similarity index 100% rename from core/tests/test_physics_2d.cpp rename to main/tests/test_physics_2d.cpp diff --git a/core/tests/test_physics_2d.h b/main/tests/test_physics_2d.h similarity index 100% rename from core/tests/test_physics_2d.h rename to main/tests/test_physics_2d.h diff --git a/core/tests/test_render.cpp b/main/tests/test_render.cpp similarity index 100% rename from core/tests/test_render.cpp rename to main/tests/test_render.cpp diff --git a/core/tests/test_render.h b/main/tests/test_render.h similarity index 100% rename from core/tests/test_render.h rename to main/tests/test_render.h diff --git a/core/tests/test_shader_lang.cpp b/main/tests/test_shader_lang.cpp similarity index 100% rename from core/tests/test_shader_lang.cpp rename to main/tests/test_shader_lang.cpp diff --git a/core/tests/test_shader_lang.h b/main/tests/test_shader_lang.h similarity index 100% rename from core/tests/test_shader_lang.h rename to main/tests/test_shader_lang.h diff --git a/core/tests/test_sound.cpp b/main/tests/test_sound.cpp similarity index 100% rename from core/tests/test_sound.cpp rename to main/tests/test_sound.cpp diff --git a/core/tests/test_sound.h b/main/tests/test_sound.h similarity index 100% rename from core/tests/test_sound.h rename to main/tests/test_sound.h diff --git a/core/tests/test_string.cpp b/main/tests/test_string.cpp similarity index 100% rename from core/tests/test_string.cpp rename to main/tests/test_string.cpp diff --git a/core/tests/test_string.h b/main/tests/test_string.h similarity index 100% rename from core/tests/test_string.h rename to main/tests/test_string.h