test: move the unit tests to the engine, and lolunit out of the engine.

.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/*/*

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

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}

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}

build/visualstudio/Lol.Core.Rules.props

@@ -15,7 +15,7 @@
       <!-- We should use %(RelativeDir) here but for some reason it's an _absolute_ dir. WTF. -->
       <ObjectFileName>$(IntDir)/%(Directory)/</ObjectFileName>
 
-      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\src\bullet;$(FlexIncludes);$(BtPhysIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\..\src;$(SolutionDir)\..\src\bullet;$(SolutionDir)\..\tools\lolunit;$(FlexIncludes);$(BtPhysIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Platform)'=='Win32'">$(GlIncludes);$(SdlIncludes);$(D3d9Includes);$(XinputIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Platform)'=='x64'">$(GlIncludes);$(SdlIncludes);$(D3d9Includes);$(XinputIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

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

demos/Makefile.am

@@ -3,5 +3,6 @@ include $(top_srcdir)/build/autotools/common.am
 
 SUBDIRS =
 SUBDIRS += lol.js
+SUBDIRS += test
 SUBDIRS += tutorial
 

test/Makefile.am → 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 \

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 \

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
+

test/unit/array.cpp → src/t/base/array.cpp

@@ -1,7 +1,7 @@
 //
 // Lol Engine
 //
-// Copyright: (c) 2010-2013 Sam Hocevar <sam@hocevar.net>
+// Copyright: (c) 2010-2014 Sam Hocevar <sam@hocevar.net>
 //   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 <lol/main.h>
-#include "lol/unit.h"
+#include <lolunit.h>
 
 namespace lol
 {

test/unit/enum.cpp → src/t/base/enum.cpp

@@ -13,7 +13,7 @@
 #endif
 
 #include <lol/main.h>
-#include "lol/unit.h"
+#include <lolunit.h>
 
 namespace lol
 {

test/unit/map.cpp → src/t/base/map.cpp

@@ -1,7 +1,7 @@
 //
 // Lol Engine
 //
-// Copyright: (c) 2010-2013 Sam Hocevar <sam@hocevar.net>
+// Copyright: (c) 2010-2014 Sam Hocevar <sam@hocevar.net>
 //   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 <lol/main.h>
-#include "lol/unit.h"
+#include <lolunit.h>
 
 namespace lol
 {

test/unit/string.cpp → src/t/base/string.cpp

@@ -1,7 +1,7 @@
 //
 // Lol Engine
 //
-// Copyright: (c) 2010-2013 Sam Hocevar <sam@hocevar.net>
+// Copyright: (c) 2010-2014 Sam Hocevar <sam@hocevar.net>
 //   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 <lol/main.h>
-#include "lol/unit.h"
+#include <lolunit.h>
 
 namespace lol
 {

test/unit/build.cpp → src/t/base/types.cpp

@@ -1,7 +1,7 @@
 //
 // Lol Engine
 //
-// Copyright: (c) 2010-2013 Sam Hocevar <sam@hocevar.net>
+// Copyright: (c) 2010-2014 Sam Hocevar <sam@hocevar.net>
 //   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 <lol/main.h>
-#include "lol/unit.h"
+#include <lolunit.h>
 
 namespace lol
 {

test/unit/camera.cpp → src/t/entity/camera.cpp

@@ -1,7 +1,7 @@
 //
 // Lol Engine
 //
-// Copyright: (c) 2010-2013 Sam Hocevar <sam@hocevar.net>
+// Copyright: (c) 2010-2014 Sam Hocevar <sam@hocevar.net>
 //            (c)      2013 Benjamin "Touky" Huet <huet.benjamin@gmail.com>
 //   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 <lol/main.h>
-#include "lol/unit.h"
+#include <lolunit.h>
 
 namespace lol
 {

test/unit/color.cpp → src/t/image/color.cpp

@@ -1,7 +1,7 @@
 //
 // Lol Engine
 //
-// Copyright: (c) 2010-2013 Sam Hocevar <sam@hocevar.net>
+// Copyright: (c) 2010-2014 Sam Hocevar <sam@hocevar.net>
 //   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 <lol/main.h>
-#include "lol/unit.h"
+#include <lolunit.h>
 
 namespace lol
 {

test/unit/image.cpp → src/t/image/image.cpp

@@ -1,7 +1,7 @@
 //
 // Lol Engine
 //
-// Copyright: (c) 2010-2011 Sam Hocevar <sam@hocevar.net>
+// Copyright: (c) 2010-2014 Sam Hocevar <sam@hocevar.net>
 //   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 <cmath>
 
 #include <lol/main.h>
-#include "lol/unit.h"
+#include <lolunit.h>
 
 namespace lol
 {

test/unit/array2d.cpp → src/t/math/array2d.cpp

@@ -13,7 +13,7 @@
 #endif
 
 #include <lol/main.h>
-#include "lol/unit.h"
+#include <lolunit.h>
 
 namespace lol
 {

test/unit/array3d.cpp → src/t/math/array3d.cpp

@@ -13,7 +13,7 @@
 #endif
 
 #include <lol/main.h>
-#include "lol/unit.h"
+#include <lolunit.h>
 
 namespace lol
 {

test/unit/arraynd.cpp → src/t/math/arraynd.cpp

@@ -13,7 +13,7 @@
 #endif
 
 #include <lol/main.h>
-#include "lol/unit.h"
+#include <lolunit.h>
 
 #include <iostream>
 

test/unit/box.cpp → src/t/math/box.cpp

@@ -1,7 +1,7 @@
 //
 // Lol Engine
 //
-// Copyright: (c) 2010-2013 Sam Hocevar <sam@hocevar.net>
+// Copyright: (c) 2010-2014 Sam Hocevar <sam@hocevar.net>
 //   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 <lol/main.h>
-#include "lol/unit.h"
+#include <lolunit.h>
 
 namespace lol
 {

test/unit/cmplx.cpp → src/t/math/cmplx.cpp

@@ -1,7 +1,7 @@
 //
 // Lol Engine
 //
-// Copyright: (c) 2010-2011 Sam Hocevar <sam@hocevar.net>
+// Copyright: (c) 2010-2014 Sam Hocevar <sam@hocevar.net>
 //   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 <lol/main.h>
-#include "lol/unit.h"
+#include <lolunit.h>
 
 namespace lol
 {

test/unit/half.cpp → src/t/math/half.cpp

@@ -1,7 +1,7 @@
 //
 // Lol Engine
 //
-// Copyright: (c) 2010-2011 Sam Hocevar <sam@hocevar.net>
+// Copyright: (c) 2010-2014 Sam Hocevar <sam@hocevar.net>
 //   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 <cmath>
 
 #include <lol/main.h>
-#include "lol/unit.h"
+#include <lolunit.h>
 
 namespace lol
 {

test/unit/interp.cpp → src/t/math/interp.cpp

@@ -1,7 +1,7 @@
 //
 // Lol Engine
 //
-// Copyright: (c) 2010-2013 Sam Hocevar <sam@hocevar.net>
+// Copyright: (c) 2010-2014 Sam Hocevar <sam@hocevar.net>
 //   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 <lol/main.h>
-#include "lol/unit.h"
+#include <lolunit.h>
 
 namespace lol
 {

test/unit/matrix.cpp → src/t/math/matrix.cpp

@@ -1,7 +1,7 @@
 //
 // Lol Engine
 //
-// Copyright: (c) 2010-2013 Sam Hocevar <sam@hocevar.net>
+// Copyright: (c) 2010-2014 Sam Hocevar <sam@hocevar.net>
 //   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 <lol/main.h>
-#include "lol/unit.h"
+#include <lolunit.h>
 
 namespace lol
 {

test/unit/quat.cpp → src/t/math/quat.cpp

@@ -13,7 +13,7 @@
 #endif
 
 #include <lol/main.h>
-#include "lol/unit.h"
+#include <lolunit.h>
 
 namespace lol
 {

test/unit/rand.cpp → src/t/math/rand.cpp

@@ -1,7 +1,7 @@
 //
 // Lol Engine
 //
-// Copyright: (c) 2010-2013 Sam Hocevar <sam@hocevar.net>
+// Copyright: (c) 2010-2014 Sam Hocevar <sam@hocevar.net>
 //   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 <lol/main.h>
-#include "lol/unit.h"
+#include <lolunit.h>
 
 namespace lol
 {

test/unit/real.cpp → src/t/math/real.cpp

@@ -1,7 +1,7 @@
 //
 // Lol Engine
 //
-// Copyright: (c) 2010-2011 Sam Hocevar <sam@hocevar.net>
+// Copyright: (c) 2010-2014 Sam Hocevar <sam@hocevar.net>
 //   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 <cmath>
 
 #include <lol/main.h>
-#include "lol/unit.h"
+#include <lolunit.h>
 
 namespace lol
 {

test/unit/rotation.cpp → src/t/math/rotation.cpp

@@ -1,7 +1,7 @@
 //
 // Lol Engine
 //
-// Copyright: (c) 2010-2013 Sam Hocevar <sam@hocevar.net>
+// Copyright: (c) 2010-2014 Sam Hocevar <sam@hocevar.net>
 //   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 <lol/main.h>
-#include "lol/unit.h"
+#include <lolunit.h>
 
 namespace lol
 {

test/unit/trig.cpp → src/t/math/trig.cpp

@@ -1,7 +1,7 @@
 //
 // Lol Engine
 //
-// Copyright: (c) 2010-2013 Sam Hocevar <sam@hocevar.net>
+// Copyright: (c) 2010-2014 Sam Hocevar <sam@hocevar.net>
 //   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 <cmath>
 
 #include <lol/main.h>
-#include "lol/unit.h"
+#include <lolunit.h>
 
 namespace lol
 {

test/unit/vector.cpp → src/t/math/vector.cpp

@@ -1,7 +1,7 @@
 //
 // Lol Engine
 //
-// Copyright: (c) 2010-2013 Sam Hocevar <sam@hocevar.net>
+// Copyright: (c) 2010-2014 Sam Hocevar <sam@hocevar.net>
 //   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 <lol/main.h>
-#include "lol/unit.h"
+#include <lolunit.h>
 
 namespace lol
 {

test/unit/thread.cpp → src/t/sys/thread.cpp

@@ -1,7 +1,7 @@
 //
 // Lol Engine
 //
-// Copyright: (c) 2010-2013 Sam Hocevar <sam@hocevar.net>
+// Copyright: (c) 2010-2014 Sam Hocevar <sam@hocevar.net>
 //   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 <lol/main.h>
-#include "lol/unit.h"
+#include <lolunit.h>
 
 namespace lol
 {

test/testsuite.vcxproj → src/t/test-base.vcxproj

@@ -43,29 +43,34 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="testsuite.cpp" />
-    <ClCompile Include="unit\array.cpp" />
-    <ClCompile Include="unit\array2d.cpp" />
-    <ClCompile Include="unit\array3d.cpp" />
-    <ClCompile Include="unit\box.cpp" />
-    <ClCompile Include="unit\build.cpp" />
-    <ClCompile Include="unit\camera.cpp" />
-    <ClCompile Include="unit\cmplx.cpp" />
-    <ClCompile Include="unit\color.cpp" />
-    <ClCompile Include="unit\enum.cpp" />
-    <ClCompile Include="unit\half.cpp" />
-    <ClCompile Include="unit\image.cpp" />
-    <ClCompile Include="unit\interp.cpp" />
-    <ClCompile Include="unit\map.cpp" />
-    <ClCompile Include="unit\matrix.cpp" />
-    <ClCompile Include="unit\quat.cpp" />
-    <ClCompile Include="unit\rand.cpp" />
-    <ClCompile Include="unit\real.cpp" />
-    <ClCompile Include="unit\rotation.cpp" />
-    <ClCompile Include="unit\string.cpp" />
-    <ClCompile Include="unit\thread.cpp" />
-    <ClCompile Include="unit\trig.cpp" />
-    <ClCompile Include="unit\vector.cpp" />
+    <ClCompile Include="test-common.cpp" />
+    <ClCompile Include="base\array.cpp" />
+    <ClCompile Include="base\enum.cpp" />
+    <ClCompile Include="base\map.cpp" />
+    <ClCompile Include="base\string.cpp" />
+    <ClCompile Include="base\types.cpp" />
+
+    <ClCompile Include="math\array2d.cpp" />
+    <ClCompile Include="math\array3d.cpp" />
+    <ClCompile Include="math\arraynd.cpp" />
+    <ClCompile Include="math\box.cpp" />
+    <ClCompile Include="math\cmplx.cpp" />
+    <ClCompile Include="math\half.cpp" />
+    <ClCompile Include="math\interp.cpp" />
+    <ClCompile Include="math\matrix.cpp" />
+    <ClCompile Include="math\quat.cpp" />
+    <ClCompile Include="math\rand.cpp" />
+    <ClCompile Include="math\real.cpp" />
+    <ClCompile Include="math\rotation.cpp" />
+    <ClCompile Include="math\trig.cpp" />
+    <ClCompile Include="math\vector.cpp" />
+
+    <ClCompile Include="sys\thread.cpp" />
+
+    <ClCompile Include="image\color.cpp" />
+    <ClCompile Include="image\image.cpp" />
+
+    <ClCompile Include="entity\camera.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)\..\src\lolcore.vcxproj">
@@ -79,7 +84,7 @@
     </ProjectReference>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{80F81C11-8DA2-4990-91CB-9807783BA46E}</ProjectGuid>
+    <ProjectGuid>{8f59a635-0240-4d7f-a80d-050c3f1670c2}</ProjectGuid>
     <ConfigurationType>Application</ConfigurationType>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>

test/testsuite.cpp → src/t/test-common.cpp

@@ -1,7 +1,7 @@
 //
 // Lol Engine
 //
-// Copyright: (c) 2010-2011 Sam Hocevar <sam@hocevar.net>
+// Copyright: (c) 2010-2014 Sam Hocevar <sam@hocevar.net>
 //   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 <lol/main.h>
 
-#include <lol/unit.h>
+#include <lolunit.h>
 
 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;
 }
 

src/t/test-entity.vcxproj

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ORBIS">
+      <Configuration>Debug</Configuration>
+      <Platform>ORBIS</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|PS3">
+      <Configuration>Debug</Configuration>
+      <Platform>PS3</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Xbox 360">
+      <Configuration>Debug</Configuration>
+      <Platform>Xbox 360</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ORBIS">
+      <Configuration>Release</Configuration>
+      <Platform>ORBIS</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|PS3">
+      <Configuration>Release</Configuration>
+      <Platform>PS3</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Xbox 360">
+      <Configuration>Release</Configuration>
+      <Platform>Xbox 360</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="test-common.cpp" />
+    <ClCompile Include="base\array.cpp" />
+    <ClCompile Include="base\enum.cpp" />
+    <ClCompile Include="base\map.cpp" />
+    <ClCompile Include="base\string.cpp" />
+    <ClCompile Include="base\types.cpp" />
+
+    <ClCompile Include="math\array2d.cpp" />
+    <ClCompile Include="math\array3d.cpp" />
+    <ClCompile Include="math\arraynd.cpp" />
+    <ClCompile Include="math\box.cpp" />
+    <ClCompile Include="math\cmplx.cpp" />
+    <ClCompile Include="math\half.cpp" />
+    <ClCompile Include="math\interp.cpp" />
+    <ClCompile Include="math\matrix.cpp" />
+    <ClCompile Include="math\quat.cpp" />
+    <ClCompile Include="math\rand.cpp" />
+    <ClCompile Include="math\real.cpp" />
+    <ClCompile Include="math\rotation.cpp" />
+    <ClCompile Include="math\trig.cpp" />
+    <ClCompile Include="math\vector.cpp" />
+
+    <ClCompile Include="sys\thread.cpp" />
+
+    <ClCompile Include="image\color.cpp" />
+    <ClCompile Include="image\image.cpp" />
+
+    <ClCompile Include="entity\camera.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(SolutionDir)\..\src\lolcore.vcxproj">
+      <Project>{9e62f2fe-3408-4eae-8238-fd84238ceeda}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(SolutionDir)\..\src\bullet\lolbullet.vcxproj">
+      <Project>{83d3b207-c601-4025-8f41-01dedc354661}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(SolutionDir)\..\src\lua\lollua.vcxproj">
+      <Project>{d84021ca-b233-4e0f-8a52-071b83bbccc4}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{d7f6c2ca-5a13-4fd0-8468-1833923e3ee3}</ProjectGuid>
+    <ConfigurationType>Application</ConfigurationType>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Config.props" />
+  <ImportGroup Label="ExtensionSettings">
+    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Vars.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <Import Project="$(SolutionDir)\visualstudio\Lol.Core.Rules.props" />
+  <ItemDefinitionGroup />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="$(SolutionDir)\visualstudio\Lol.Fx.targets" />
+  </ImportGroup>
+</Project>