From e86964936f31b595189fd8ac52f7394ee4783da7 Mon Sep 17 00:00:00 2001 From: Lynix Date: Tue, 4 Oct 2016 21:33:56 +0200 Subject: [PATCH] Add server-side unit tests Former-commit-id: 1db8c846b260cccaa6dc21590554cca469f5ffce [formerly 08a850f788da4d0d8b7c9ce5517fedf096c592d8] [formerly ae83af3d9153471ab88c285a4dd903e50460e1b2 [formerly e744d24dbc26b54a851c4fff0d166ea702fa1c1d]] Former-commit-id: 8b0e0287c6a3f6fb456ff5c4a2f397ee3818d1d4 [formerly 35170cc7321b0bf5dcfe4813cd48b82afdb7ac07] Former-commit-id: 525a0269014feb28795553339ca9d3621a36654a --- .travis.yml | 2 +- appveyor.yml | 6 ++--- build/scripts/tools/ndk_server.lua | 1 - build/scripts/tools/unittests_server.lua | 34 ++++++++++++++++++++++++ 4 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 build/scripts/tools/unittests_server.lua diff --git a/.travis.yml b/.travis.yml index 90c64fe4a..d1ed3ec6d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,4 +46,4 @@ script: after_script: - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:../lib/gmake/x64/:../extlibs/lib/gmake/x64/ && cd ../../tests && - ./NazaraUnitTests + ./NazaraUnitTestsServer diff --git a/appveyor.yml b/appveyor.yml index 1dbe500e9..f91b3a927 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -36,13 +36,11 @@ platform: build: project: build/$(TOOLSET)/NazaraEngine.sln - -#after_build: -# - cd tests && "./NazaraUnitTests" after_build: - cd build && "./premake5.exe" package && cd ../package - - 7z a NazaraEngine.7z * + - 7z a NazaraEngine.7z * && cd .. + - cd tests && "./NazaraUnitTestsServer.exe" artifacts: - path: package/NazaraEngine.7z diff --git a/build/scripts/tools/ndk_server.lua b/build/scripts/tools/ndk_server.lua index cebd158c6..b5d258283 100644 --- a/build/scripts/tools/ndk_server.lua +++ b/build/scripts/tools/ndk_server.lua @@ -38,7 +38,6 @@ TOOL.FilesExcluded = { "../SDK/**/LuaBinding_Renderer.*" } - TOOL.Libraries = { "NazaraCore", "NazaraLua", diff --git a/build/scripts/tools/unittests_server.lua b/build/scripts/tools/unittests_server.lua new file mode 100644 index 000000000..b3eab27c0 --- /dev/null +++ b/build/scripts/tools/unittests_server.lua @@ -0,0 +1,34 @@ +TOOL.Name = "UnitTestsServer" + +TOOL.Directory = "../tests" +TOOL.EnableConsole = true +TOOL.Kind = "Application" +TOOL.TargetDirectory = TOOL.Directory + +TOOL.Defines = { + "NDK_SERVER" +} + +TOOL.Includes = { + "../include" +} + +TOOL.Files = { + "../tests/main.cpp", + "../tests/Engine/**.cpp", + "../tests/SDK/**.cpp" +} + +-- Excludes client-only files +TOOL.FilesExcluded = { + "../tests/Engine/Audio/**", + "../tests/Engine/Graphics/**", + "../tests/SDK/NDK/Application.cpp", + "../tests/SDK/NDK/Systems/ListenerSystem.cpp", + "../tests/SDK/NDK/Systems/RenderSystem.cpp" +} + +TOOL.Libraries = { + "NazaraNetwork", + "NazaraSDKServer" +}