From cadc4d18b0c93a8ef15c678b07d4384d9d17da9b Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Sun, 31 Aug 2014 23:35:28 +0000 Subject: [PATCH] test: move the unit tests to the engine, and lolunit out of the engine. --- .gitignore | 30 +++-- Makefile.am | 2 +- build/Lol (vs2013).sln | 74 +++--------- build/Lol (vs2014).sln | 74 +++--------- build/visualstudio/Lol.Core.Rules.props | 2 +- configure.ac | 19 ++-- demos/Makefile.am | 1 + {test => demos/test}/Makefile.am | 20 +--- {test => demos/test}/benchmark/half.cpp | 0 {test => demos/test}/benchmark/real.cpp | 0 {test => demos/test}/benchmark/trig.cpp | 0 {test => demos/test}/benchmark/vector.cpp | 0 {test => demos/test}/benchsuite.cpp | 0 {test => demos/test}/benchsuite.vcxproj | 0 {test => demos/test}/btphystest.cpp | 0 {test => demos/test}/btphystest.h | 0 {test => demos/test}/btphystest.vcxproj | 0 .../test}/btphystest.vcxproj.filters | 0 {test => demos/test}/data/CatsSheet.png | Bin {test => demos/test}/data/CatsSheet.xcf | Bin {test => demos/test}/data/mesh-buffer.txt | 0 {test => demos/test}/data/test-texture.png | Bin {test => demos/test}/easymeshdictionnary.js | 0 .../test}/front_camera_sprite.lolfx | 0 {test => demos/test}/generated/location.hh | 0 {test => demos/test}/generated/position.hh | 0 .../test}/generated/scenesetup-parser.cpp | 0 .../test}/generated/scenesetup-parser.h | 0 .../test}/generated/scenesetup-parser.output | 0 .../test}/generated/scenesetup-scanner.cpp | 0 {test => demos/test}/generated/stack.hh | 0 {test => demos/test}/javascript/empty.html | 0 .../test}/javascript/naclloading.js | 0 .../test}/javascript/progressstatus.js | 0 .../test}/javascript/typedictionnary.js | 0 {test => demos/test}/javascript/utils.js | 0 {test => demos/test}/math/Makefile.am | 0 {test => demos/test}/math/pi.cpp | 0 {test => demos/test}/math/poly.cpp | 0 {test => demos/test}/meshviewer.cpp | 0 {test => demos/test}/meshviewer.em.html | 0 {test => demos/test}/meshviewer.index.html | 0 {test => demos/test}/meshviewer.nacl.html | 0 {test => demos/test}/meshviewer.nacl.nmf | 0 {test => demos/test}/meshviewer.vcxproj | 0 {test => demos/test}/nacl_phystest.cpp | 0 {test => demos/test}/nacl_phystest.h | 0 {test => demos/test}/nacl_phystest.vcxproj | 0 .../test}/nacl_phystest.vcxproj.filters | 0 {test => demos/test}/physicobject.h | 0 .../physics/bulletcharactercontroller.cpp | 0 .../test}/physics/bulletcharactercontroller.h | 0 .../test}/physics/easycharactercontroller.cpp | 0 .../test}/physics/easycharactercontroller.h | 0 .../test}/physics/easyconstraint.cpp | 0 {test => demos/test}/physics/easyconstraint.h | 0 {test => demos/test}/physics/easyphysics.cpp | 0 {test => demos/test}/physics/easyphysics.h | 0 .../test}/physics/lolbtphysicsintegration.h | 0 {test => demos/test}/physics/lolphysics.h | 0 {test => demos/test}/sandbox/Makefile.am | 0 {test => demos/test}/sandbox/sample.cpp | 0 {test => demos/test}/scenesetup-compiler.cpp | 0 {test => demos/test}/scenesetup-compiler.h | 0 {test => demos/test}/scenesetup-parser.y | 0 {test => demos/test}/scenesetup-scanner.l | 0 {test => demos/test}/scenesetup.cpp | 0 {test => demos/test}/scenesetup.h | 0 {test => demos/test}/scenesetupdictionnary.js | 0 {test => demos/test}/shinyfur.lolfx | 0 {test => demos/test}/shinymvtexture.lolfx | 0 src/Makefile.am | 7 +- src/t/Makefile.am | 43 +++++++ {test/unit => src/t/base}/array.cpp | 4 +- {test/unit => src/t/base}/enum.cpp | 2 +- {test/unit => src/t/base}/map.cpp | 4 +- {test/unit => src/t/base}/string.cpp | 4 +- test/unit/build.cpp => src/t/base/types.cpp | 4 +- {test => src/t}/data/gradient.png | Bin {test/unit => src/t/entity}/camera.cpp | 4 +- {test/unit => src/t/image}/color.cpp | 4 +- {test/unit => src/t/image}/image.cpp | 4 +- {test/unit => src/t/math}/array2d.cpp | 2 +- {test/unit => src/t/math}/array3d.cpp | 2 +- {test/unit => src/t/math}/arraynd.cpp | 2 +- {test/unit => src/t/math}/box.cpp | 4 +- {test/unit => src/t/math}/cmplx.cpp | 4 +- {test/unit => src/t/math}/half.cpp | 4 +- {test/unit => src/t/math}/interp.cpp | 4 +- {test/unit => src/t/math}/matrix.cpp | 4 +- {test/unit => src/t/math}/quat.cpp | 2 +- {test/unit => src/t/math}/rand.cpp | 4 +- {test/unit => src/t/math}/real.cpp | 4 +- {test/unit => src/t/math}/rotation.cpp | 4 +- {test/unit => src/t/math}/trig.cpp | 4 +- {test/unit => src/t/math}/vector.cpp | 4 +- {test/unit => src/t/sys}/thread.cpp | 4 +- .../t/test-base.vcxproj | 53 +++++---- test/testsuite.cpp => src/t/test-common.cpp | 8 +- src/t/test-entity.vcxproj | 106 ++++++++++++++++++ src/t/test-image.vcxproj | 106 ++++++++++++++++++ src/t/test-math.vcxproj | 106 ++++++++++++++++++ src/t/test-sys.vcxproj | 106 ++++++++++++++++++ tools/Makefile.am | 1 + tools/lolunit/Makefile.am | 5 + src/lol/unit.h => tools/lolunit/lolunit.h | 0 106 files changed, 615 insertions(+), 230 deletions(-) rename {test => demos/test}/Makefile.am (71%) rename {test => demos/test}/benchmark/half.cpp (100%) rename {test => demos/test}/benchmark/real.cpp (100%) rename {test => demos/test}/benchmark/trig.cpp (100%) rename {test => demos/test}/benchmark/vector.cpp (100%) rename {test => demos/test}/benchsuite.cpp (100%) rename {test => demos/test}/benchsuite.vcxproj (100%) rename {test => demos/test}/btphystest.cpp (100%) rename {test => demos/test}/btphystest.h (100%) rename {test => demos/test}/btphystest.vcxproj (100%) rename {test => demos/test}/btphystest.vcxproj.filters (100%) rename {test => demos/test}/data/CatsSheet.png (100%) rename {test => demos/test}/data/CatsSheet.xcf (100%) rename {test => demos/test}/data/mesh-buffer.txt (100%) rename {test => demos/test}/data/test-texture.png (100%) rename {test => demos/test}/easymeshdictionnary.js (100%) rename {test => demos/test}/front_camera_sprite.lolfx (100%) rename {test => demos/test}/generated/location.hh (100%) rename {test => demos/test}/generated/position.hh (100%) rename {test => demos/test}/generated/scenesetup-parser.cpp (100%) rename {test => demos/test}/generated/scenesetup-parser.h (100%) rename {test => demos/test}/generated/scenesetup-parser.output (100%) rename {test => demos/test}/generated/scenesetup-scanner.cpp (100%) rename {test => demos/test}/generated/stack.hh (100%) rename {test => demos/test}/javascript/empty.html (100%) rename {test => demos/test}/javascript/naclloading.js (100%) rename {test => demos/test}/javascript/progressstatus.js (100%) rename {test => demos/test}/javascript/typedictionnary.js (100%) rename {test => demos/test}/javascript/utils.js (100%) rename {test => demos/test}/math/Makefile.am (100%) rename {test => demos/test}/math/pi.cpp (100%) rename {test => demos/test}/math/poly.cpp (100%) rename {test => demos/test}/meshviewer.cpp (100%) rename {test => demos/test}/meshviewer.em.html (100%) rename {test => demos/test}/meshviewer.index.html (100%) rename {test => demos/test}/meshviewer.nacl.html (100%) rename {test => demos/test}/meshviewer.nacl.nmf (100%) rename {test => demos/test}/meshviewer.vcxproj (100%) rename {test => demos/test}/nacl_phystest.cpp (100%) rename {test => demos/test}/nacl_phystest.h (100%) rename {test => demos/test}/nacl_phystest.vcxproj (100%) rename {test => demos/test}/nacl_phystest.vcxproj.filters (100%) rename {test => demos/test}/physicobject.h (100%) rename {test => demos/test}/physics/bulletcharactercontroller.cpp (100%) rename {test => demos/test}/physics/bulletcharactercontroller.h (100%) rename {test => demos/test}/physics/easycharactercontroller.cpp (100%) rename {test => demos/test}/physics/easycharactercontroller.h (100%) rename {test => demos/test}/physics/easyconstraint.cpp (100%) rename {test => demos/test}/physics/easyconstraint.h (100%) rename {test => demos/test}/physics/easyphysics.cpp (100%) rename {test => demos/test}/physics/easyphysics.h (100%) rename {test => demos/test}/physics/lolbtphysicsintegration.h (100%) rename {test => demos/test}/physics/lolphysics.h (100%) rename {test => demos/test}/sandbox/Makefile.am (100%) rename {test => demos/test}/sandbox/sample.cpp (100%) rename {test => demos/test}/scenesetup-compiler.cpp (100%) rename {test => demos/test}/scenesetup-compiler.h (100%) rename {test => demos/test}/scenesetup-parser.y (100%) rename {test => demos/test}/scenesetup-scanner.l (100%) rename {test => demos/test}/scenesetup.cpp (100%) rename {test => demos/test}/scenesetup.h (100%) rename {test => demos/test}/scenesetupdictionnary.js (100%) rename {test => demos/test}/shinyfur.lolfx (100%) rename {test => demos/test}/shinymvtexture.lolfx (100%) create mode 100644 src/t/Makefile.am rename {test/unit => src/t/base}/array.cpp (98%) rename {test/unit => src/t/base}/enum.cpp (98%) rename {test/unit => src/t/base}/map.cpp (94%) rename {test/unit => src/t/base}/string.cpp (98%) rename test/unit/build.cpp => src/t/base/types.cpp (97%) rename {test => src/t}/data/gradient.png (100%) rename {test/unit => src/t/entity}/camera.cpp (98%) rename {test/unit => src/t/image}/color.cpp (98%) rename {test/unit => src/t/image}/image.cpp (93%) rename {test/unit => src/t/math}/array2d.cpp (98%) rename {test/unit => src/t/math}/array3d.cpp (99%) rename {test/unit => src/t/math}/arraynd.cpp (99%) rename {test/unit => src/t/math}/box.cpp (94%) rename {test/unit => src/t/math}/cmplx.cpp (96%) rename {test/unit => src/t/math}/half.cpp (99%) rename {test/unit => src/t/math}/interp.cpp (92%) rename {test/unit => src/t/math}/matrix.cpp (98%) rename {test/unit => src/t/math}/quat.cpp (99%) rename {test/unit => src/t/math}/rand.cpp (96%) rename {test/unit => src/t/math}/real.cpp (99%) rename {test/unit => src/t/math}/rotation.cpp (98%) rename {test/unit => src/t/math}/trig.cpp (98%) rename {test/unit => src/t/math}/vector.cpp (99%) rename {test/unit => src/t/sys}/thread.cpp (92%) rename test/testsuite.vcxproj => src/t/test-base.vcxproj (74%) rename test/testsuite.cpp => src/t/test-common.cpp (69%) create mode 100644 src/t/test-entity.vcxproj create mode 100644 src/t/test-image.vcxproj create mode 100644 src/t/test-math.vcxproj create mode 100644 src/t/test-sys.vcxproj create mode 100644 tools/lolunit/Makefile.am rename src/lol/unit.h => tools/lolunit/lolunit.h (100%) diff --git a/.gitignore b/.gitignore index 1c714429..3fa74743 100644 --- a/.gitignore +++ b/.gitignore @@ -73,17 +73,15 @@ _ReSharper.* !external/*/*/*/*/*/* !external/*/*/*/*/*/*/* # Our binaries -test/benchsuite -test/btphystest -test/meshviewer -test/nacl_phystest -test/testsuite -test/sandbox/sample -test/math/pi -test/math/poly -test/nacl_phystest -tools/make-font demos/lol.js/lol.js +demos/test/benchsuite +demos/test/btphystest +demos/test/meshviewer +demos/test/nacl_phystest +demos/test/sandbox/sample +demos/test/math/pi +demos/test/math/poly +demos/test/nacl_phystest demos/tutorial/01_triangle demos/tutorial/02_cube demos/tutorial/03_noise @@ -94,6 +92,7 @@ demos/tutorial/07_input demos/tutorial/08_fbo demos/tutorial/11_fractal demos/tutorial/12_voronoi +tools/make-font # Our data doc/doxygen.cfg doc/doxygen.log @@ -101,8 +100,15 @@ doc/html doc/latex doc/man # Our test suites -test/testsuite.log -test/testsuite.trs +build/check-*.log +build/check-*.trs +src/t/test-base +src/t/test-math +src/t/test-sys +src/t/test-image +src/t/test-entity +src/t/test-*.log +src/t/test-*.trs # Our tools tools/vslol/bin/*/* tools/vslol/obj/*/* diff --git a/Makefile.am b/Makefile.am index 79fc699f..9cfefbcd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/build/autotools/common.am # Put "people" at the end because they're more likely to break builds. -SUBDIRS = build src test tools demos games people doc +SUBDIRS = build src tools demos games people doc DIST_SUBDIRS = $(SUBDIRS) binaries EXTRA_DIST += bootstrap COPYING TODO diff --git a/build/Lol (vs2013).sln b/build/Lol (vs2013).sln index 5a95368a..61a3c495 100644 --- a/build/Lol (vs2013).sln +++ b/build/Lol (vs2013).sln @@ -4,25 +4,10 @@ Microsoft Visual Studio Solution File, Format Version 12.00 VisualStudioVersion = 12.0.30501.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deushax", "..\games\deushax\deushax.vcxproj", "{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}" - ProjectSection(ProjectDependencies) = postProject - {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} - {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661} - {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "monsterz", "..\games\monsterz\monsterz.vcxproj", "{17F0F184-4436-4D08-B8AA-16572EA238DB}" - ProjectSection(ProjectDependencies) = postProject - {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} - {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661} - {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editor", "..\games\deushax\editor.vcxproj", "{9C66B179-0737-4BDA-AB42-2ADE478A9008}" - ProjectSection(ProjectDependencies) = postProject - {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} - {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661} - {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4} - EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Deus Hax", "Deus Hax", "{08C6A854-533D-4A1E-924E-C4A62281869F}" EndProject @@ -34,60 +19,33 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lolbullet", "..\src\bullet\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lollua", "..\src\lua\lollua.vcxproj", "{D84021CA-B233-4E0F-8A52-071B83BBCCC4}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{E0491194-35E3-4513-9D31-608EA3165ECF}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-base", "..\src\t\test-base.vcxproj", "{8F59A635-0240-4D7F-A80D-050C3F1670C2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benchsuite", "..\test\benchsuite.vcxproj", "{B1E10086-A1DA-401A-834D-969C9DBB5CC1}" - ProjectSection(ProjectDependencies) = postProject - {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} - {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661} - {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-math", "..\src\t\test-math.vcxproj", "{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "..\test\testsuite.vcxproj", "{80F81C11-8DA2-4990-91CB-9807783BA46E}" - ProjectSection(ProjectDependencies) = postProject - {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} - {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661} - {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-sys", "..\src\t\test-sys.vcxproj", "{1782F849-B6E1-466D-9F02-A751F3F8712C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-image", "..\src\t\test-image.vcxproj", "{5A27FF18-A1EC-49BE-9455-415F1C701153}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-entity", "..\src\t\test-entity.vcxproj", "{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{E0491194-35E3-4513-9D31-608EA3165ECF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benchsuite", "..\demos\test\benchsuite.vcxproj", "{B1E10086-A1DA-401A-834D-969C9DBB5CC1}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tutorial", "Tutorial", "{E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "01_triangle", "..\demos\tutorial\01_triangle.vcxproj", "{B92ABADC-45BE-4CC5-B724-9426053123A1}" - ProjectSection(ProjectDependencies) = postProject - {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} - {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661} - {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "02_cube", "..\demos\tutorial\02_cube.vcxproj", "{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}" - ProjectSection(ProjectDependencies) = postProject - {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} - {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661} - {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "05_easymesh", "..\demos\tutorial\05_easymesh.vcxproj", "{1C5B8702-290C-42DA-AA9E-671348F5B747}" - ProjectSection(ProjectDependencies) = postProject - {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} - {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661} - {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "11_fractal", "..\demos\tutorial\11_fractal.vcxproj", "{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}" - ProjectSection(ProjectDependencies) = postProject - {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} - {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661} - {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4} - EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MrPigeon", "MrPigeon", "{33704AA4-F2B5-4138-A40D-E3E77F89ED46}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrpigeon", "..\games\mrpigeon\mrpigeon.vcxproj", "{32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}" - ProjectSection(ProjectDependencies) = postProject - {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} - {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661} - {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4} - EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Games", "Games", "{1DFE1729-4F1B-47CA-9819-72431FE14E25}" EndProject @@ -110,7 +68,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Touky", "Touky", "{9EA99B18 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "touky_demo", "..\people\touky\touky_demo\touky_demo.vcxproj", "{EE203B88-44CF-4859-9D42-7A5F43FECB52}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btphystest", "..\test\btphystest.vcxproj", "{EE203B88-44CF-4859-9D42-7A1F43FECB52}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btphystest", "..\demos\test\btphystest.vcxproj", "{EE203B88-44CF-4859-9D42-7A1F43FECB52}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "08_fbo", "..\demos\tutorial\08_fbo.vcxproj", "{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}" EndProject @@ -136,7 +94,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Benlitz", "Benlitz", "{B583 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benlitzTest1", "..\people\benlitz\test1\benlitzTest1.vcxproj", "{FAF82AD2-D9F4-4694-9A01-103BC5B771B4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "meshviewer", "..\test\meshviewer.vcxproj", "{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "meshviewer", "..\demos\test\meshviewer.vcxproj", "{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tactics", "..\people\touky\tactics\tactics.vcxproj", "{25493FC8-75AC-4703-AD58-AB0C4A0FB79C}" EndProject @@ -759,8 +717,12 @@ Global {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {1AFD580B-98B8-4689-B661-38C41132C60E} {83D3B207-C601-4025-8F41-01DEDC354661} = {1AFD580B-98B8-4689-B661-38C41132C60E} {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {1AFD580B-98B8-4689-B661-38C41132C60E} + {8F59A635-0240-4D7F-A80D-050C3F1670C2} = {1AFD580B-98B8-4689-B661-38C41132C60E} + {962D4E25-45D3-4ACE-8C02-69FA3713ABD4} = {1AFD580B-98B8-4689-B661-38C41132C60E} + {1782F849-B6E1-466D-9F02-A751F3F8712C} = {1AFD580B-98B8-4689-B661-38C41132C60E} + {5A27FF18-A1EC-49BE-9455-415F1C701153} = {1AFD580B-98B8-4689-B661-38C41132C60E} + {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3} = {1AFD580B-98B8-4689-B661-38C41132C60E} {B1E10086-A1DA-401A-834D-969C9DBB5CC1} = {E0491194-35E3-4513-9D31-608EA3165ECF} - {80F81C11-8DA2-4990-91CB-9807783BA46E} = {E0491194-35E3-4513-9D31-608EA3165ECF} {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} = {E5C5E320-C077-4362-9A3F-3920C6447601} {B92ABADC-45BE-4CC5-B724-9426053123A1} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} diff --git a/build/Lol (vs2014).sln b/build/Lol (vs2014).sln index 5a95368a..61a3c495 100644 --- a/build/Lol (vs2014).sln +++ b/build/Lol (vs2014).sln @@ -4,25 +4,10 @@ Microsoft Visual Studio Solution File, Format Version 12.00 VisualStudioVersion = 12.0.30501.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deushax", "..\games\deushax\deushax.vcxproj", "{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}" - ProjectSection(ProjectDependencies) = postProject - {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} - {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661} - {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "monsterz", "..\games\monsterz\monsterz.vcxproj", "{17F0F184-4436-4D08-B8AA-16572EA238DB}" - ProjectSection(ProjectDependencies) = postProject - {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} - {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661} - {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editor", "..\games\deushax\editor.vcxproj", "{9C66B179-0737-4BDA-AB42-2ADE478A9008}" - ProjectSection(ProjectDependencies) = postProject - {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} - {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661} - {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4} - EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Deus Hax", "Deus Hax", "{08C6A854-533D-4A1E-924E-C4A62281869F}" EndProject @@ -34,60 +19,33 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lolbullet", "..\src\bullet\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lollua", "..\src\lua\lollua.vcxproj", "{D84021CA-B233-4E0F-8A52-071B83BBCCC4}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{E0491194-35E3-4513-9D31-608EA3165ECF}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-base", "..\src\t\test-base.vcxproj", "{8F59A635-0240-4D7F-A80D-050C3F1670C2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benchsuite", "..\test\benchsuite.vcxproj", "{B1E10086-A1DA-401A-834D-969C9DBB5CC1}" - ProjectSection(ProjectDependencies) = postProject - {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} - {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661} - {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-math", "..\src\t\test-math.vcxproj", "{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "..\test\testsuite.vcxproj", "{80F81C11-8DA2-4990-91CB-9807783BA46E}" - ProjectSection(ProjectDependencies) = postProject - {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} - {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661} - {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-sys", "..\src\t\test-sys.vcxproj", "{1782F849-B6E1-466D-9F02-A751F3F8712C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-image", "..\src\t\test-image.vcxproj", "{5A27FF18-A1EC-49BE-9455-415F1C701153}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-entity", "..\src\t\test-entity.vcxproj", "{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{E0491194-35E3-4513-9D31-608EA3165ECF}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benchsuite", "..\demos\test\benchsuite.vcxproj", "{B1E10086-A1DA-401A-834D-969C9DBB5CC1}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tutorial", "Tutorial", "{E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "01_triangle", "..\demos\tutorial\01_triangle.vcxproj", "{B92ABADC-45BE-4CC5-B724-9426053123A1}" - ProjectSection(ProjectDependencies) = postProject - {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} - {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661} - {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "02_cube", "..\demos\tutorial\02_cube.vcxproj", "{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}" - ProjectSection(ProjectDependencies) = postProject - {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} - {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661} - {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "05_easymesh", "..\demos\tutorial\05_easymesh.vcxproj", "{1C5B8702-290C-42DA-AA9E-671348F5B747}" - ProjectSection(ProjectDependencies) = postProject - {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} - {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661} - {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "11_fractal", "..\demos\tutorial\11_fractal.vcxproj", "{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}" - ProjectSection(ProjectDependencies) = postProject - {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} - {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661} - {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4} - EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MrPigeon", "MrPigeon", "{33704AA4-F2B5-4138-A40D-E3E77F89ED46}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrpigeon", "..\games\mrpigeon\mrpigeon.vcxproj", "{32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}" - ProjectSection(ProjectDependencies) = postProject - {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} - {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661} - {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4} - EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Games", "Games", "{1DFE1729-4F1B-47CA-9819-72431FE14E25}" EndProject @@ -110,7 +68,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Touky", "Touky", "{9EA99B18 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "touky_demo", "..\people\touky\touky_demo\touky_demo.vcxproj", "{EE203B88-44CF-4859-9D42-7A5F43FECB52}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btphystest", "..\test\btphystest.vcxproj", "{EE203B88-44CF-4859-9D42-7A1F43FECB52}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btphystest", "..\demos\test\btphystest.vcxproj", "{EE203B88-44CF-4859-9D42-7A1F43FECB52}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "08_fbo", "..\demos\tutorial\08_fbo.vcxproj", "{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}" EndProject @@ -136,7 +94,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Benlitz", "Benlitz", "{B583 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benlitzTest1", "..\people\benlitz\test1\benlitzTest1.vcxproj", "{FAF82AD2-D9F4-4694-9A01-103BC5B771B4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "meshviewer", "..\test\meshviewer.vcxproj", "{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "meshviewer", "..\demos\test\meshviewer.vcxproj", "{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tactics", "..\people\touky\tactics\tactics.vcxproj", "{25493FC8-75AC-4703-AD58-AB0C4A0FB79C}" EndProject @@ -759,8 +717,12 @@ Global {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {1AFD580B-98B8-4689-B661-38C41132C60E} {83D3B207-C601-4025-8F41-01DEDC354661} = {1AFD580B-98B8-4689-B661-38C41132C60E} {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {1AFD580B-98B8-4689-B661-38C41132C60E} + {8F59A635-0240-4D7F-A80D-050C3F1670C2} = {1AFD580B-98B8-4689-B661-38C41132C60E} + {962D4E25-45D3-4ACE-8C02-69FA3713ABD4} = {1AFD580B-98B8-4689-B661-38C41132C60E} + {1782F849-B6E1-466D-9F02-A751F3F8712C} = {1AFD580B-98B8-4689-B661-38C41132C60E} + {5A27FF18-A1EC-49BE-9455-415F1C701153} = {1AFD580B-98B8-4689-B661-38C41132C60E} + {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3} = {1AFD580B-98B8-4689-B661-38C41132C60E} {B1E10086-A1DA-401A-834D-969C9DBB5CC1} = {E0491194-35E3-4513-9D31-608EA3165ECF} - {80F81C11-8DA2-4990-91CB-9807783BA46E} = {E0491194-35E3-4513-9D31-608EA3165ECF} {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} = {E5C5E320-C077-4362-9A3F-3920C6447601} {B92ABADC-45BE-4CC5-B724-9426053123A1} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} diff --git a/build/visualstudio/Lol.Core.Rules.props b/build/visualstudio/Lol.Core.Rules.props index bfb4c25c..856d6aa2 100644 --- a/build/visualstudio/Lol.Core.Rules.props +++ b/build/visualstudio/Lol.Core.Rules.props @@ -15,7 +15,7 @@ $(IntDir)/%(Directory)/ - $(SolutionDir)\..\src;$(SolutionDir)\..\src\bullet;$(FlexIncludes);$(BtPhysIncludes);%(AdditionalIncludeDirectories) + $(SolutionDir)\..\src;$(SolutionDir)\..\src\bullet;$(SolutionDir)\..\tools\lolunit;$(FlexIncludes);$(BtPhysIncludes);%(AdditionalIncludeDirectories) $(GlIncludes);$(SdlIncludes);$(D3d9Includes);$(XinputIncludes);%(AdditionalIncludeDirectories) $(GlIncludes);$(SdlIncludes);$(D3d9Includes);$(XinputIncludes);%(AdditionalIncludeDirectories) NOMINMAX;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) diff --git a/configure.ac b/configure.ac index 5558bcd3..bc73ca79 100644 --- a/configure.ac +++ b/configure.ac @@ -191,11 +191,10 @@ AM_CONDITIONAL(USE_LATEX, test "${LATEX}" != "no") AM_CONDITIONAL(USE_DOT, test "${DOT}" != "no") -dnl No exceptions +dnl No exceptions… LOL_TRY_CXXFLAGS(-fno-exceptions, [AM_CXXFLAGS="${AM_CXXFLAGS} -fno-exceptions"]) LOL_TRY_CXXFLAGS(-fno-rtti, [AM_CXXFLAGS="${AM_CXXFLAGS} -fno-rtti"]) - dnl Debug symbols LOL_TRY_LDFLAGS(-rdynamic, [AM_LDFLAGS="${AM_LDFLAGS} -rdynamic"]) @@ -500,9 +499,7 @@ AC_CONFIG_FILES( src/lua/Makefile src/data/Makefile src/data/font/Makefile - test/Makefile - test/math/Makefile - test/sandbox/Makefile + src/t/Makefile build/Makefile binaries/Makefile people/Makefile @@ -544,15 +541,15 @@ AC_CONFIG_FILES( AC_CONFIG_FILES( [demos/tutorial/Makefile demos/lol.js/Makefile + demos/test/Makefile + demos/test/math/Makefile + demos/test/sandbox/Makefile ]) AC_CONFIG_FILES( [tools/lolremez/Makefile -]) -AC_CONFIG_FILES( - [tools/neercs/Makefile -]) -AC_CONFIG_FILES( - [tools/pimp/Makefile + tools/lolunit/Makefile + tools/neercs/Makefile + tools/pimp/Makefile ]) AC_CONFIG_FILES( [people/jnat/Makefile diff --git a/demos/Makefile.am b/demos/Makefile.am index 42157fcf..615408e8 100644 --- a/demos/Makefile.am +++ b/demos/Makefile.am @@ -3,5 +3,6 @@ include $(top_srcdir)/build/autotools/common.am SUBDIRS = SUBDIRS += lol.js +SUBDIRS += test SUBDIRS += tutorial diff --git a/test/Makefile.am b/demos/test/Makefile.am similarity index 71% rename from test/Makefile.am rename to demos/test/Makefile.am index 7e61e561..414c9080 100644 --- a/test/Makefile.am +++ b/demos/test/Makefile.am @@ -6,25 +6,7 @@ SUBDIRS = math sandbox bench: benchsuite$(EXEEXT) ./benchsuite$(EXEEXT) -noinst_PROGRAMS = benchsuite $(testsuite) btphystest nacl_phystest meshviewer - -TESTS = $(testsuite) - -# Conditionally built for now because of STLport issues -if !USE_ANDROID -testsuite = testsuite -endif - -testsuite_SOURCES = testsuite.cpp \ - unit/vector.cpp unit/matrix.cpp unit/half.cpp unit/trig.cpp \ - unit/build.cpp unit/real.cpp unit/image.cpp unit/quat.cpp unit/cmplx.cpp \ - unit/array.cpp unit/array2d.cpp unit/array3d.cpp unit/arraynd.cpp \ - unit/string.cpp unit/map.cpp unit/color.cpp unit/enum.cpp \ - unit/interp.cpp unit/box.cpp unit/rand.cpp unit/thread.cpp \ - unit/camera.cpp unit/rotation.cpp -testsuite_CPPFLAGS = $(AM_CPPFLAGS) -testsuite_DEPENDENCIES = @LOL_DEPS@ -noinst_DATA = data/gradient.png +noinst_PROGRAMS = benchsuite btphystest nacl_phystest meshviewer benchsuite_SOURCES = benchsuite.cpp \ benchmark/vector.cpp benchmark/half.cpp benchmark/trig.cpp \ diff --git a/test/benchmark/half.cpp b/demos/test/benchmark/half.cpp similarity index 100% rename from test/benchmark/half.cpp rename to demos/test/benchmark/half.cpp diff --git a/test/benchmark/real.cpp b/demos/test/benchmark/real.cpp similarity index 100% rename from test/benchmark/real.cpp rename to demos/test/benchmark/real.cpp diff --git a/test/benchmark/trig.cpp b/demos/test/benchmark/trig.cpp similarity index 100% rename from test/benchmark/trig.cpp rename to demos/test/benchmark/trig.cpp diff --git a/test/benchmark/vector.cpp b/demos/test/benchmark/vector.cpp similarity index 100% rename from test/benchmark/vector.cpp rename to demos/test/benchmark/vector.cpp diff --git a/test/benchsuite.cpp b/demos/test/benchsuite.cpp similarity index 100% rename from test/benchsuite.cpp rename to demos/test/benchsuite.cpp diff --git a/test/benchsuite.vcxproj b/demos/test/benchsuite.vcxproj similarity index 100% rename from test/benchsuite.vcxproj rename to demos/test/benchsuite.vcxproj diff --git a/test/btphystest.cpp b/demos/test/btphystest.cpp similarity index 100% rename from test/btphystest.cpp rename to demos/test/btphystest.cpp diff --git a/test/btphystest.h b/demos/test/btphystest.h similarity index 100% rename from test/btphystest.h rename to demos/test/btphystest.h diff --git a/test/btphystest.vcxproj b/demos/test/btphystest.vcxproj similarity index 100% rename from test/btphystest.vcxproj rename to demos/test/btphystest.vcxproj diff --git a/test/btphystest.vcxproj.filters b/demos/test/btphystest.vcxproj.filters similarity index 100% rename from test/btphystest.vcxproj.filters rename to demos/test/btphystest.vcxproj.filters diff --git a/test/data/CatsSheet.png b/demos/test/data/CatsSheet.png similarity index 100% rename from test/data/CatsSheet.png rename to demos/test/data/CatsSheet.png diff --git a/test/data/CatsSheet.xcf b/demos/test/data/CatsSheet.xcf similarity index 100% rename from test/data/CatsSheet.xcf rename to demos/test/data/CatsSheet.xcf diff --git a/test/data/mesh-buffer.txt b/demos/test/data/mesh-buffer.txt similarity index 100% rename from test/data/mesh-buffer.txt rename to demos/test/data/mesh-buffer.txt diff --git a/test/data/test-texture.png b/demos/test/data/test-texture.png similarity index 100% rename from test/data/test-texture.png rename to demos/test/data/test-texture.png diff --git a/test/easymeshdictionnary.js b/demos/test/easymeshdictionnary.js similarity index 100% rename from test/easymeshdictionnary.js rename to demos/test/easymeshdictionnary.js diff --git a/test/front_camera_sprite.lolfx b/demos/test/front_camera_sprite.lolfx similarity index 100% rename from test/front_camera_sprite.lolfx rename to demos/test/front_camera_sprite.lolfx diff --git a/test/generated/location.hh b/demos/test/generated/location.hh similarity index 100% rename from test/generated/location.hh rename to demos/test/generated/location.hh diff --git a/test/generated/position.hh b/demos/test/generated/position.hh similarity index 100% rename from test/generated/position.hh rename to demos/test/generated/position.hh diff --git a/test/generated/scenesetup-parser.cpp b/demos/test/generated/scenesetup-parser.cpp similarity index 100% rename from test/generated/scenesetup-parser.cpp rename to demos/test/generated/scenesetup-parser.cpp diff --git a/test/generated/scenesetup-parser.h b/demos/test/generated/scenesetup-parser.h similarity index 100% rename from test/generated/scenesetup-parser.h rename to demos/test/generated/scenesetup-parser.h diff --git a/test/generated/scenesetup-parser.output b/demos/test/generated/scenesetup-parser.output similarity index 100% rename from test/generated/scenesetup-parser.output rename to demos/test/generated/scenesetup-parser.output diff --git a/test/generated/scenesetup-scanner.cpp b/demos/test/generated/scenesetup-scanner.cpp similarity index 100% rename from test/generated/scenesetup-scanner.cpp rename to demos/test/generated/scenesetup-scanner.cpp diff --git a/test/generated/stack.hh b/demos/test/generated/stack.hh similarity index 100% rename from test/generated/stack.hh rename to demos/test/generated/stack.hh diff --git a/test/javascript/empty.html b/demos/test/javascript/empty.html similarity index 100% rename from test/javascript/empty.html rename to demos/test/javascript/empty.html diff --git a/test/javascript/naclloading.js b/demos/test/javascript/naclloading.js similarity index 100% rename from test/javascript/naclloading.js rename to demos/test/javascript/naclloading.js diff --git a/test/javascript/progressstatus.js b/demos/test/javascript/progressstatus.js similarity index 100% rename from test/javascript/progressstatus.js rename to demos/test/javascript/progressstatus.js diff --git a/test/javascript/typedictionnary.js b/demos/test/javascript/typedictionnary.js similarity index 100% rename from test/javascript/typedictionnary.js rename to demos/test/javascript/typedictionnary.js diff --git a/test/javascript/utils.js b/demos/test/javascript/utils.js similarity index 100% rename from test/javascript/utils.js rename to demos/test/javascript/utils.js diff --git a/test/math/Makefile.am b/demos/test/math/Makefile.am similarity index 100% rename from test/math/Makefile.am rename to demos/test/math/Makefile.am diff --git a/test/math/pi.cpp b/demos/test/math/pi.cpp similarity index 100% rename from test/math/pi.cpp rename to demos/test/math/pi.cpp diff --git a/test/math/poly.cpp b/demos/test/math/poly.cpp similarity index 100% rename from test/math/poly.cpp rename to demos/test/math/poly.cpp diff --git a/test/meshviewer.cpp b/demos/test/meshviewer.cpp similarity index 100% rename from test/meshviewer.cpp rename to demos/test/meshviewer.cpp diff --git a/test/meshviewer.em.html b/demos/test/meshviewer.em.html similarity index 100% rename from test/meshviewer.em.html rename to demos/test/meshviewer.em.html diff --git a/test/meshviewer.index.html b/demos/test/meshviewer.index.html similarity index 100% rename from test/meshviewer.index.html rename to demos/test/meshviewer.index.html diff --git a/test/meshviewer.nacl.html b/demos/test/meshviewer.nacl.html similarity index 100% rename from test/meshviewer.nacl.html rename to demos/test/meshviewer.nacl.html diff --git a/test/meshviewer.nacl.nmf b/demos/test/meshviewer.nacl.nmf similarity index 100% rename from test/meshviewer.nacl.nmf rename to demos/test/meshviewer.nacl.nmf diff --git a/test/meshviewer.vcxproj b/demos/test/meshviewer.vcxproj similarity index 100% rename from test/meshviewer.vcxproj rename to demos/test/meshviewer.vcxproj diff --git a/test/nacl_phystest.cpp b/demos/test/nacl_phystest.cpp similarity index 100% rename from test/nacl_phystest.cpp rename to demos/test/nacl_phystest.cpp diff --git a/test/nacl_phystest.h b/demos/test/nacl_phystest.h similarity index 100% rename from test/nacl_phystest.h rename to demos/test/nacl_phystest.h diff --git a/test/nacl_phystest.vcxproj b/demos/test/nacl_phystest.vcxproj similarity index 100% rename from test/nacl_phystest.vcxproj rename to demos/test/nacl_phystest.vcxproj diff --git a/test/nacl_phystest.vcxproj.filters b/demos/test/nacl_phystest.vcxproj.filters similarity index 100% rename from test/nacl_phystest.vcxproj.filters rename to demos/test/nacl_phystest.vcxproj.filters diff --git a/test/physicobject.h b/demos/test/physicobject.h similarity index 100% rename from test/physicobject.h rename to demos/test/physicobject.h diff --git a/test/physics/bulletcharactercontroller.cpp b/demos/test/physics/bulletcharactercontroller.cpp similarity index 100% rename from test/physics/bulletcharactercontroller.cpp rename to demos/test/physics/bulletcharactercontroller.cpp diff --git a/test/physics/bulletcharactercontroller.h b/demos/test/physics/bulletcharactercontroller.h similarity index 100% rename from test/physics/bulletcharactercontroller.h rename to demos/test/physics/bulletcharactercontroller.h diff --git a/test/physics/easycharactercontroller.cpp b/demos/test/physics/easycharactercontroller.cpp similarity index 100% rename from test/physics/easycharactercontroller.cpp rename to demos/test/physics/easycharactercontroller.cpp diff --git a/test/physics/easycharactercontroller.h b/demos/test/physics/easycharactercontroller.h similarity index 100% rename from test/physics/easycharactercontroller.h rename to demos/test/physics/easycharactercontroller.h diff --git a/test/physics/easyconstraint.cpp b/demos/test/physics/easyconstraint.cpp similarity index 100% rename from test/physics/easyconstraint.cpp rename to demos/test/physics/easyconstraint.cpp diff --git a/test/physics/easyconstraint.h b/demos/test/physics/easyconstraint.h similarity index 100% rename from test/physics/easyconstraint.h rename to demos/test/physics/easyconstraint.h diff --git a/test/physics/easyphysics.cpp b/demos/test/physics/easyphysics.cpp similarity index 100% rename from test/physics/easyphysics.cpp rename to demos/test/physics/easyphysics.cpp diff --git a/test/physics/easyphysics.h b/demos/test/physics/easyphysics.h similarity index 100% rename from test/physics/easyphysics.h rename to demos/test/physics/easyphysics.h diff --git a/test/physics/lolbtphysicsintegration.h b/demos/test/physics/lolbtphysicsintegration.h similarity index 100% rename from test/physics/lolbtphysicsintegration.h rename to demos/test/physics/lolbtphysicsintegration.h diff --git a/test/physics/lolphysics.h b/demos/test/physics/lolphysics.h similarity index 100% rename from test/physics/lolphysics.h rename to demos/test/physics/lolphysics.h diff --git a/test/sandbox/Makefile.am b/demos/test/sandbox/Makefile.am similarity index 100% rename from test/sandbox/Makefile.am rename to demos/test/sandbox/Makefile.am diff --git a/test/sandbox/sample.cpp b/demos/test/sandbox/sample.cpp similarity index 100% rename from test/sandbox/sample.cpp rename to demos/test/sandbox/sample.cpp diff --git a/test/scenesetup-compiler.cpp b/demos/test/scenesetup-compiler.cpp similarity index 100% rename from test/scenesetup-compiler.cpp rename to demos/test/scenesetup-compiler.cpp diff --git a/test/scenesetup-compiler.h b/demos/test/scenesetup-compiler.h similarity index 100% rename from test/scenesetup-compiler.h rename to demos/test/scenesetup-compiler.h diff --git a/test/scenesetup-parser.y b/demos/test/scenesetup-parser.y similarity index 100% rename from test/scenesetup-parser.y rename to demos/test/scenesetup-parser.y diff --git a/test/scenesetup-scanner.l b/demos/test/scenesetup-scanner.l similarity index 100% rename from test/scenesetup-scanner.l rename to demos/test/scenesetup-scanner.l diff --git a/test/scenesetup.cpp b/demos/test/scenesetup.cpp similarity index 100% rename from test/scenesetup.cpp rename to demos/test/scenesetup.cpp diff --git a/test/scenesetup.h b/demos/test/scenesetup.h similarity index 100% rename from test/scenesetup.h rename to demos/test/scenesetup.h diff --git a/test/scenesetupdictionnary.js b/demos/test/scenesetupdictionnary.js similarity index 100% rename from test/scenesetupdictionnary.js rename to demos/test/scenesetupdictionnary.js diff --git a/test/shinyfur.lolfx b/demos/test/shinyfur.lolfx similarity index 100% rename from test/shinyfur.lolfx rename to demos/test/shinyfur.lolfx diff --git a/test/shinymvtexture.lolfx b/demos/test/shinymvtexture.lolfx similarity index 100% rename from test/shinymvtexture.lolfx rename to demos/test/shinymvtexture.lolfx diff --git a/src/Makefile.am b/src/Makefile.am index 153e15f3..4775e474 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ include $(top_srcdir)/build/autotools/common.am -SUBDIRS = bullet lua data +SUBDIRS = bullet lua data . t noinst_LIBRARIES = liblolcore.a @@ -11,8 +11,8 @@ liblolcore_a_SOURCES = \ entity.cpp entity.h ticker.cpp ticker.h lolgl.h \ tileset.cpp tileset.h forge.cpp forge.h video.cpp video.h \ world.cpp world.h sample.cpp sample.h sampler.cpp sampler.h \ - profiler.cpp profiler.h text.cpp text.h emitter.cpp emitter.h numeric.h utils.h \ - messageservice.cpp messageservice.h \ + profiler.cpp profiler.h text.cpp text.h emitter.cpp emitter.h \ + numeric.h utils.h messageservice.cpp messageservice.h \ worldentity.cpp worldentity.h gradient.cpp gradient.h gradient.lolfx \ platform.cpp platform.h sprite.cpp sprite.h camera.cpp camera.h \ light.cpp light.h \ @@ -33,7 +33,6 @@ EXTRA_DIST += easymesh/easymesh-scanner.l easymesh/easymesh-parser.y \ liblolcore_headers = \ lol/main.h lol/engine.h lol/extras.h \ - lol/unit.h \ \ lol/base/all.h \ lol/base/features.h lol/base/tuple.h lol/base/types.h lol/base/array.h \ diff --git a/src/t/Makefile.am b/src/t/Makefile.am new file mode 100644 index 00000000..273b79af --- /dev/null +++ b/src/t/Makefile.am @@ -0,0 +1,43 @@ + +include $(top_srcdir)/build/autotools/common.am + +noinst_PROGRAMS = $(testsuite) + +TESTS = $(testsuite) + +# Conditionally built for now because of STLport issues +if !USE_ANDROID +testsuite = test-base test-math test-sys test-image test-entity +endif + +test_base_SOURCES = test-common.cpp \ + base/array.cpp base/enum.cpp base/map.cpp base/string.cpp \ + base/types.cpp +test_base_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tools/lolunit +test_base_DEPENDENCIES = @LOL_DEPS@ + +test_math_SOURCES = test-common.cpp \ + math/array2d.cpp math/array3d.cpp math/arraynd.cpp math/box.cpp \ + math/cmplx.cpp math/half.cpp math/interp.cpp math/matrix.cpp \ + math/quat.cpp math/rand.cpp math/real.cpp math/rotation.cpp \ + math/trig.cpp math/vector.cpp +test_math_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tools/lolunit +test_math_DEPENDENCIES = @LOL_DEPS@ + +test_sys_SOURCES = test-common.cpp \ + sys/thread.cpp +test_sys_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tools/lolunit +test_sys_DEPENDENCIES = @LOL_DEPS@ + +test_image_SOURCES = test-common.cpp \ + image/color.cpp image/image.cpp +test_image_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tools/lolunit +test_image_DEPENDENCIES = @LOL_DEPS@ + +test_entity_SOURCES = test-common.cpp \ + entity/camera.cpp +test_entity_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tools/lolunit +test_entity_DEPENDENCIES = @LOL_DEPS@ + +noinst_DATA = data/gradient.png + diff --git a/test/unit/array.cpp b/src/t/base/array.cpp similarity index 98% rename from test/unit/array.cpp rename to src/t/base/array.cpp index 20a52852..27d3685e 100644 --- a/test/unit/array.cpp +++ b/src/t/base/array.cpp @@ -1,7 +1,7 @@ // // Lol Engine // -// Copyright: (c) 2010-2013 Sam Hocevar +// Copyright: (c) 2010-2014 Sam Hocevar // This program is free software; you can redistribute it and/or // modify it under the terms of the Do What The Fuck You Want To // Public License, Version 2, as published by Sam Hocevar. See @@ -13,7 +13,7 @@ #endif #include -#include "lol/unit.h" +#include namespace lol { diff --git a/test/unit/enum.cpp b/src/t/base/enum.cpp similarity index 98% rename from test/unit/enum.cpp rename to src/t/base/enum.cpp index 1c2cdf03..cb5195cd 100644 --- a/test/unit/enum.cpp +++ b/src/t/base/enum.cpp @@ -13,7 +13,7 @@ #endif #include -#include "lol/unit.h" +#include namespace lol { diff --git a/test/unit/map.cpp b/src/t/base/map.cpp similarity index 94% rename from test/unit/map.cpp rename to src/t/base/map.cpp index 816bf530..c276ef8a 100644 --- a/test/unit/map.cpp +++ b/src/t/base/map.cpp @@ -1,7 +1,7 @@ // // Lol Engine // -// Copyright: (c) 2010-2013 Sam Hocevar +// Copyright: (c) 2010-2014 Sam Hocevar // This program is free software; you can redistribute it and/or // modify it under the terms of the Do What The Fuck You Want To // Public License, Version 2, as published by Sam Hocevar. See @@ -13,7 +13,7 @@ #endif #include -#include "lol/unit.h" +#include namespace lol { diff --git a/test/unit/string.cpp b/src/t/base/string.cpp similarity index 98% rename from test/unit/string.cpp rename to src/t/base/string.cpp index 08365482..de8228cb 100644 --- a/test/unit/string.cpp +++ b/src/t/base/string.cpp @@ -1,7 +1,7 @@ // // Lol Engine // -// Copyright: (c) 2010-2013 Sam Hocevar +// Copyright: (c) 2010-2014 Sam Hocevar // This program is free software; you can redistribute it and/or // modify it under the terms of the Do What The Fuck You Want To // Public License, Version 2, as published by Sam Hocevar. See @@ -13,7 +13,7 @@ #endif #include -#include "lol/unit.h" +#include namespace lol { diff --git a/test/unit/build.cpp b/src/t/base/types.cpp similarity index 97% rename from test/unit/build.cpp rename to src/t/base/types.cpp index 5b7a6764..db6f0841 100644 --- a/test/unit/build.cpp +++ b/src/t/base/types.cpp @@ -1,7 +1,7 @@ // // Lol Engine // -// Copyright: (c) 2010-2013 Sam Hocevar +// Copyright: (c) 2010-2014 Sam Hocevar // This program is free software; you can redistribute it and/or // modify it under the terms of the Do What The Fuck You Want To // Public License, Version 2, as published by Sam Hocevar. See @@ -13,7 +13,7 @@ #endif #include -#include "lol/unit.h" +#include namespace lol { diff --git a/test/data/gradient.png b/src/t/data/gradient.png similarity index 100% rename from test/data/gradient.png rename to src/t/data/gradient.png diff --git a/test/unit/camera.cpp b/src/t/entity/camera.cpp similarity index 98% rename from test/unit/camera.cpp rename to src/t/entity/camera.cpp index df056a56..4f27d1a3 100644 --- a/test/unit/camera.cpp +++ b/src/t/entity/camera.cpp @@ -1,7 +1,7 @@ // // Lol Engine // -// Copyright: (c) 2010-2013 Sam Hocevar +// Copyright: (c) 2010-2014 Sam Hocevar // (c) 2013 Benjamin "Touky" Huet // This program is free software; you can redistribute it and/or // modify it under the terms of the Do What The Fuck You Want To @@ -14,7 +14,7 @@ #endif #include -#include "lol/unit.h" +#include namespace lol { diff --git a/test/unit/color.cpp b/src/t/image/color.cpp similarity index 98% rename from test/unit/color.cpp rename to src/t/image/color.cpp index 0b932934..04c0b0d8 100644 --- a/test/unit/color.cpp +++ b/src/t/image/color.cpp @@ -1,7 +1,7 @@ // // Lol Engine // -// Copyright: (c) 2010-2013 Sam Hocevar +// Copyright: (c) 2010-2014 Sam Hocevar // This program is free software; you can redistribute it and/or // modify it under the terms of the Do What The Fuck You Want To // Public License, Version 2, as published by Sam Hocevar. See @@ -13,7 +13,7 @@ #endif #include -#include "lol/unit.h" +#include namespace lol { diff --git a/test/unit/image.cpp b/src/t/image/image.cpp similarity index 93% rename from test/unit/image.cpp rename to src/t/image/image.cpp index 9790cbf0..f7f26463 100644 --- a/test/unit/image.cpp +++ b/src/t/image/image.cpp @@ -1,7 +1,7 @@ // // Lol Engine // -// Copyright: (c) 2010-2011 Sam Hocevar +// Copyright: (c) 2010-2014 Sam Hocevar // This program is free software; you can redistribute it and/or // modify it under the terms of the Do What The Fuck You Want To // Public License, Version 2, as published by Sam Hocevar. See @@ -15,7 +15,7 @@ #include #include -#include "lol/unit.h" +#include namespace lol { diff --git a/test/unit/array2d.cpp b/src/t/math/array2d.cpp similarity index 98% rename from test/unit/array2d.cpp rename to src/t/math/array2d.cpp index c89a8dd8..3851467b 100644 --- a/test/unit/array2d.cpp +++ b/src/t/math/array2d.cpp @@ -13,7 +13,7 @@ #endif #include -#include "lol/unit.h" +#include namespace lol { diff --git a/test/unit/array3d.cpp b/src/t/math/array3d.cpp similarity index 99% rename from test/unit/array3d.cpp rename to src/t/math/array3d.cpp index 9888d085..0615b233 100644 --- a/test/unit/array3d.cpp +++ b/src/t/math/array3d.cpp @@ -13,7 +13,7 @@ #endif #include -#include "lol/unit.h" +#include namespace lol { diff --git a/test/unit/arraynd.cpp b/src/t/math/arraynd.cpp similarity index 99% rename from test/unit/arraynd.cpp rename to src/t/math/arraynd.cpp index d7bdc418..35fcec83 100644 --- a/test/unit/arraynd.cpp +++ b/src/t/math/arraynd.cpp @@ -13,7 +13,7 @@ #endif #include -#include "lol/unit.h" +#include #include diff --git a/test/unit/box.cpp b/src/t/math/box.cpp similarity index 94% rename from test/unit/box.cpp rename to src/t/math/box.cpp index cd15b892..4a9276ed 100644 --- a/test/unit/box.cpp +++ b/src/t/math/box.cpp @@ -1,7 +1,7 @@ // // Lol Engine // -// Copyright: (c) 2010-2013 Sam Hocevar +// Copyright: (c) 2010-2014 Sam Hocevar // This program is free software; you can redistribute it and/or // modify it under the terms of the Do What The Fuck You Want To // Public License, Version 2, as published by Sam Hocevar. See @@ -13,7 +13,7 @@ #endif #include -#include "lol/unit.h" +#include namespace lol { diff --git a/test/unit/cmplx.cpp b/src/t/math/cmplx.cpp similarity index 96% rename from test/unit/cmplx.cpp rename to src/t/math/cmplx.cpp index 7805bfa2..cca558ed 100644 --- a/test/unit/cmplx.cpp +++ b/src/t/math/cmplx.cpp @@ -1,7 +1,7 @@ // // Lol Engine // -// Copyright: (c) 2010-2011 Sam Hocevar +// Copyright: (c) 2010-2014 Sam Hocevar // This program is free software; you can redistribute it and/or // modify it under the terms of the Do What The Fuck You Want To // Public License, Version 2, as published by Sam Hocevar. See @@ -13,7 +13,7 @@ #endif #include -#include "lol/unit.h" +#include namespace lol { diff --git a/test/unit/half.cpp b/src/t/math/half.cpp similarity index 99% rename from test/unit/half.cpp rename to src/t/math/half.cpp index 423779ff..693d6369 100644 --- a/test/unit/half.cpp +++ b/src/t/math/half.cpp @@ -1,7 +1,7 @@ // // Lol Engine // -// Copyright: (c) 2010-2011 Sam Hocevar +// Copyright: (c) 2010-2014 Sam Hocevar // This program is free software; you can redistribute it and/or // modify it under the terms of the Do What The Fuck You Want To // Public License, Version 2, as published by Sam Hocevar. See @@ -15,7 +15,7 @@ #include #include -#include "lol/unit.h" +#include namespace lol { diff --git a/test/unit/interp.cpp b/src/t/math/interp.cpp similarity index 92% rename from test/unit/interp.cpp rename to src/t/math/interp.cpp index 948ad11c..4233aa1f 100644 --- a/test/unit/interp.cpp +++ b/src/t/math/interp.cpp @@ -1,7 +1,7 @@ // // Lol Engine // -// Copyright: (c) 2010-2013 Sam Hocevar +// Copyright: (c) 2010-2014 Sam Hocevar // This program is free software; you can redistribute it and/or // modify it under the terms of the Do What The Fuck You Want To // Public License, Version 2, as published by Sam Hocevar. See @@ -13,7 +13,7 @@ #endif #include -#include "lol/unit.h" +#include namespace lol { diff --git a/test/unit/matrix.cpp b/src/t/math/matrix.cpp similarity index 98% rename from test/unit/matrix.cpp rename to src/t/math/matrix.cpp index fc14a403..1cdd1be5 100644 --- a/test/unit/matrix.cpp +++ b/src/t/math/matrix.cpp @@ -1,7 +1,7 @@ // // Lol Engine // -// Copyright: (c) 2010-2013 Sam Hocevar +// Copyright: (c) 2010-2014 Sam Hocevar // This program is free software; you can redistribute it and/or // modify it under the terms of the Do What The Fuck You Want To // Public License, Version 2, as published by Sam Hocevar. See @@ -13,7 +13,7 @@ #endif #include -#include "lol/unit.h" +#include namespace lol { diff --git a/test/unit/quat.cpp b/src/t/math/quat.cpp similarity index 99% rename from test/unit/quat.cpp rename to src/t/math/quat.cpp index 7e283e23..9dc87ec8 100644 --- a/test/unit/quat.cpp +++ b/src/t/math/quat.cpp @@ -13,7 +13,7 @@ #endif #include -#include "lol/unit.h" +#include namespace lol { diff --git a/test/unit/rand.cpp b/src/t/math/rand.cpp similarity index 96% rename from test/unit/rand.cpp rename to src/t/math/rand.cpp index b013496d..bc6acfc7 100644 --- a/test/unit/rand.cpp +++ b/src/t/math/rand.cpp @@ -1,7 +1,7 @@ // // Lol Engine // -// Copyright: (c) 2010-2013 Sam Hocevar +// Copyright: (c) 2010-2014 Sam Hocevar // This program is free software; you can redistribute it and/or // modify it under the terms of the Do What The Fuck You Want To // Public License, Version 2, as published by Sam Hocevar. See @@ -13,7 +13,7 @@ #endif #include -#include "lol/unit.h" +#include namespace lol { diff --git a/test/unit/real.cpp b/src/t/math/real.cpp similarity index 99% rename from test/unit/real.cpp rename to src/t/math/real.cpp index ee936e95..25be4b29 100644 --- a/test/unit/real.cpp +++ b/src/t/math/real.cpp @@ -1,7 +1,7 @@ // // Lol Engine // -// Copyright: (c) 2010-2011 Sam Hocevar +// Copyright: (c) 2010-2014 Sam Hocevar // This program is free software; you can redistribute it and/or // modify it under the terms of the Do What The Fuck You Want To // Public License, Version 2, as published by Sam Hocevar. See @@ -15,7 +15,7 @@ #include #include -#include "lol/unit.h" +#include namespace lol { diff --git a/test/unit/rotation.cpp b/src/t/math/rotation.cpp similarity index 98% rename from test/unit/rotation.cpp rename to src/t/math/rotation.cpp index ef564891..ba596873 100644 --- a/test/unit/rotation.cpp +++ b/src/t/math/rotation.cpp @@ -1,7 +1,7 @@ // // Lol Engine // -// Copyright: (c) 2010-2013 Sam Hocevar +// Copyright: (c) 2010-2014 Sam Hocevar // This program is free software; you can redistribute it and/or // modify it under the terms of the Do What The Fuck You Want To // Public License, Version 2, as published by Sam Hocevar. See @@ -13,7 +13,7 @@ #endif #include -#include "lol/unit.h" +#include namespace lol { diff --git a/test/unit/trig.cpp b/src/t/math/trig.cpp similarity index 98% rename from test/unit/trig.cpp rename to src/t/math/trig.cpp index d76dbb12..10b1969a 100644 --- a/test/unit/trig.cpp +++ b/src/t/math/trig.cpp @@ -1,7 +1,7 @@ // // Lol Engine // -// Copyright: (c) 2010-2013 Sam Hocevar +// Copyright: (c) 2010-2014 Sam Hocevar // This program is free software; you can redistribute it and/or // modify it under the terms of the Do What The Fuck You Want To // Public License, Version 2, as published by Sam Hocevar. See @@ -15,7 +15,7 @@ #include #include -#include "lol/unit.h" +#include namespace lol { diff --git a/test/unit/vector.cpp b/src/t/math/vector.cpp similarity index 99% rename from test/unit/vector.cpp rename to src/t/math/vector.cpp index 9b0d8813..8a5e2ed2 100644 --- a/test/unit/vector.cpp +++ b/src/t/math/vector.cpp @@ -1,7 +1,7 @@ // // Lol Engine // -// Copyright: (c) 2010-2013 Sam Hocevar +// Copyright: (c) 2010-2014 Sam Hocevar // This program is free software; you can redistribute it and/or // modify it under the terms of the Do What The Fuck You Want To // Public License, Version 2, as published by Sam Hocevar. See @@ -13,7 +13,7 @@ #endif #include -#include "lol/unit.h" +#include namespace lol { diff --git a/test/unit/thread.cpp b/src/t/sys/thread.cpp similarity index 92% rename from test/unit/thread.cpp rename to src/t/sys/thread.cpp index 946e9668..bb1a4af0 100644 --- a/test/unit/thread.cpp +++ b/src/t/sys/thread.cpp @@ -1,7 +1,7 @@ // // Lol Engine // -// Copyright: (c) 2010-2013 Sam Hocevar +// Copyright: (c) 2010-2014 Sam Hocevar // This program is free software; you can redistribute it and/or // modify it under the terms of the Do What The Fuck You Want To // Public License, Version 2, as published by Sam Hocevar. See @@ -13,7 +13,7 @@ #endif #include -#include "lol/unit.h" +#include namespace lol { diff --git a/test/testsuite.vcxproj b/src/t/test-base.vcxproj similarity index 74% rename from test/testsuite.vcxproj rename to src/t/test-base.vcxproj index 983eb30e..8ce6f7ff 100644 --- a/test/testsuite.vcxproj +++ b/src/t/test-base.vcxproj @@ -43,29 +43,34 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -79,7 +84,7 @@ - {80F81C11-8DA2-4990-91CB-9807783BA46E} + {8f59a635-0240-4d7f-a80d-050c3f1670c2} Application Win32Proj diff --git a/test/testsuite.cpp b/src/t/test-common.cpp similarity index 69% rename from test/testsuite.cpp rename to src/t/test-common.cpp index 78cef8bc..91b64abf 100644 --- a/test/testsuite.cpp +++ b/src/t/test-common.cpp @@ -1,7 +1,7 @@ // // Lol Engine // -// Copyright: (c) 2010-2011 Sam Hocevar +// Copyright: (c) 2010-2014 Sam Hocevar // This program is free software; you can redistribute it and/or // modify it under the terms of the Do What The Fuck You Want To // Public License, Version 2, as published by Sam Hocevar. See @@ -17,14 +17,12 @@ #include -#include +#include int main(int argc, char **argv) { UNUSED(argc, argv); - lol::TextTestRunner runner; - bool success = runner.Run(); - return success ? EXIT_SUCCESS : EXIT_FAILURE; + return EXIT_SUCCESS; } diff --git a/src/t/test-entity.vcxproj b/src/t/test-entity.vcxproj new file mode 100644 index 00000000..079c40e5 --- /dev/null +++ b/src/t/test-entity.vcxproj @@ -0,0 +1,106 @@ + + + + + Debug + ORBIS + + + Debug + PS3 + + + Debug + Win32 + + + Debug + x64 + + + Debug + Xbox 360 + + + Release + ORBIS + + + Release + PS3 + + + Release + Win32 + + + Release + x64 + + + Release + Xbox 360 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {9e62f2fe-3408-4eae-8238-fd84238ceeda} + + + {83d3b207-c601-4025-8f41-01dedc354661} + + + {d84021ca-b233-4e0f-8a52-071b83bbccc4} + + + + {d7f6c2ca-5a13-4fd0-8468-1833923e3ee3} + Application + Win32Proj + + + + + + + + + + + + + + + + + diff --git a/src/t/test-image.vcxproj b/src/t/test-image.vcxproj new file mode 100644 index 00000000..13a3c171 --- /dev/null +++ b/src/t/test-image.vcxproj @@ -0,0 +1,106 @@ + + + + + Debug + ORBIS + + + Debug + PS3 + + + Debug + Win32 + + + Debug + x64 + + + Debug + Xbox 360 + + + Release + ORBIS + + + Release + PS3 + + + Release + Win32 + + + Release + x64 + + + Release + Xbox 360 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {9e62f2fe-3408-4eae-8238-fd84238ceeda} + + + {83d3b207-c601-4025-8f41-01dedc354661} + + + {d84021ca-b233-4e0f-8a52-071b83bbccc4} + + + + {5a27ff18-a1ec-49be-9455-415f1c701153} + Application + Win32Proj + + + + + + + + + + + + + + + + + diff --git a/src/t/test-math.vcxproj b/src/t/test-math.vcxproj new file mode 100644 index 00000000..42af848b --- /dev/null +++ b/src/t/test-math.vcxproj @@ -0,0 +1,106 @@ + + + + + Debug + ORBIS + + + Debug + PS3 + + + Debug + Win32 + + + Debug + x64 + + + Debug + Xbox 360 + + + Release + ORBIS + + + Release + PS3 + + + Release + Win32 + + + Release + x64 + + + Release + Xbox 360 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {9e62f2fe-3408-4eae-8238-fd84238ceeda} + + + {83d3b207-c601-4025-8f41-01dedc354661} + + + {d84021ca-b233-4e0f-8a52-071b83bbccc4} + + + + {962d4e25-45d3-4ace-8c02-69fa3713abd4} + Application + Win32Proj + + + + + + + + + + + + + + + + + diff --git a/src/t/test-sys.vcxproj b/src/t/test-sys.vcxproj new file mode 100644 index 00000000..1f76aa81 --- /dev/null +++ b/src/t/test-sys.vcxproj @@ -0,0 +1,106 @@ + + + + + Debug + ORBIS + + + Debug + PS3 + + + Debug + Win32 + + + Debug + x64 + + + Debug + Xbox 360 + + + Release + ORBIS + + + Release + PS3 + + + Release + Win32 + + + Release + x64 + + + Release + Xbox 360 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {9e62f2fe-3408-4eae-8238-fd84238ceeda} + + + {83d3b207-c601-4025-8f41-01dedc354661} + + + {d84021ca-b233-4e0f-8a52-071b83bbccc4} + + + + {1782f849-b6e1-466d-9f02-a751f3f8712c} + Application + Win32Proj + + + + + + + + + + + + + + + + + diff --git a/tools/Makefile.am b/tools/Makefile.am index 11f88d1c..e97cdd5e 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -3,6 +3,7 @@ include $(top_srcdir)/build/autotools/common.am SUBDIRS = SUBDIRS += lolremez +SUBDIRS += lolunit SUBDIRS += neercs SUBDIRS += pimp SUBDIRS += vimlol diff --git a/tools/lolunit/Makefile.am b/tools/lolunit/Makefile.am new file mode 100644 index 00000000..077fbffe --- /dev/null +++ b/tools/lolunit/Makefile.am @@ -0,0 +1,5 @@ + +include $(top_srcdir)/build/autotools/common.am + +EXTRA_DIST += lolunit.h + diff --git a/src/lol/unit.h b/tools/lolunit/lolunit.h similarity index 100% rename from src/lol/unit.h rename to tools/lolunit/lolunit.h