Merge pull request #115 from SofiaCPP/feature/gctest

Add app to test GC implementations

3 files changed, 63 insertions, 1 deletions

diff --git a/JSImpl/solution/JSImpl.sln b/JSImpl/solution/JSImpl.sln
index bb2638e..89a91b3 100644
--- a/JSImpl/solution/JSImpl.sln
+++ b/JSImpl/solution/JSImpl.sln
@@ -7,6 +7,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gtest", "gtest", "{1BAF0A7D
 EndProject

 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JSImpl", "JSImpl", "{C30B5025-2FEB-CEC0-3803-5A97A4613522}"

 EndProject

+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gctest", "gctest", "{5EF0341D-CACF-B3B8-D3E7-3E8F3F461A1A}"

+EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sprun", "..\..\spasm\solution\sprun.vcxproj", "{FD605F10-6975-87C1-32F7-2A219ECA83F2}"

 	ProjectSection(ProjectDependencies) = postProject

 		{AE0A9E7C-9A41-9F0D-432E-85102F441B0F} = {AE0A9E7C-9A41-9F0D-432E-85102F441B0F}

@@ -44,6 +46,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spasm", "..\..\spasm\soluti
 		{3F16CDE1-AB80-8158-F4BE-32FE60685FAD} = {3F16CDE1-AB80-8158-F4BE-32FE60685FAD}

 	EndProjectSection

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_bench", "..\..\gctest\solution\test_bench.vcxproj", "{A41847E7-90D0-8834-F9D7-6190E5AE2325}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "leak_gc", "..\..\gctest\solution\leak_gc.vcxproj", "{8BDD0170-F7BC-800B-00D5-0BE26C33E76C}"

+	ProjectSection(ProjectDependencies) = postProject

+		{A41847E7-90D0-8834-F9D7-6190E5AE2325} = {A41847E7-90D0-8834-F9D7-6190E5AE2325}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dummy_gc", "..\..\gctest\solution\dummy_gc.vcxproj", "{3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}"

+	ProjectSection(ProjectDependencies) = postProject

+		{A41847E7-90D0-8834-F9D7-6190E5AE2325} = {A41847E7-90D0-8834-F9D7-6190E5AE2325}

+	EndProjectSection

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -132,6 +146,30 @@ Global
 		{69185F10-D52C-87C1-9EAE-2A210A8283F2}.Release|Win32.Build.0 = Release|Win32

 		{69185F10-D52C-87C1-9EAE-2A210A8283F2}.Release|x64.ActiveCfg = Release|x64

 		{69185F10-D52C-87C1-9EAE-2A210A8283F2}.Release|x64.Build.0 = Release|x64

+		{A41847E7-90D0-8834-F9D7-6190E5AE2325}.Debug|Win32.ActiveCfg = Debug|Win32

+		{A41847E7-90D0-8834-F9D7-6190E5AE2325}.Debug|Win32.Build.0 = Debug|Win32

+		{A41847E7-90D0-8834-F9D7-6190E5AE2325}.Debug|x64.ActiveCfg = Debug|x64

+		{A41847E7-90D0-8834-F9D7-6190E5AE2325}.Debug|x64.Build.0 = Debug|x64

+		{A41847E7-90D0-8834-F9D7-6190E5AE2325}.Release|Win32.ActiveCfg = Release|Win32

+		{A41847E7-90D0-8834-F9D7-6190E5AE2325}.Release|Win32.Build.0 = Release|Win32

+		{A41847E7-90D0-8834-F9D7-6190E5AE2325}.Release|x64.ActiveCfg = Release|x64

+		{A41847E7-90D0-8834-F9D7-6190E5AE2325}.Release|x64.Build.0 = Release|x64

+		{8BDD0170-F7BC-800B-00D5-0BE26C33E76C}.Debug|Win32.ActiveCfg = Debug|Win32

+		{8BDD0170-F7BC-800B-00D5-0BE26C33E76C}.Debug|Win32.Build.0 = Debug|Win32

+		{8BDD0170-F7BC-800B-00D5-0BE26C33E76C}.Debug|x64.ActiveCfg = Debug|x64

+		{8BDD0170-F7BC-800B-00D5-0BE26C33E76C}.Debug|x64.Build.0 = Debug|x64

+		{8BDD0170-F7BC-800B-00D5-0BE26C33E76C}.Release|Win32.ActiveCfg = Release|Win32

+		{8BDD0170-F7BC-800B-00D5-0BE26C33E76C}.Release|Win32.Build.0 = Release|Win32

+		{8BDD0170-F7BC-800B-00D5-0BE26C33E76C}.Release|x64.ActiveCfg = Release|x64

+		{8BDD0170-F7BC-800B-00D5-0BE26C33E76C}.Release|x64.Build.0 = Release|x64

+		{3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}.Debug|Win32.ActiveCfg = Debug|Win32

+		{3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}.Debug|Win32.Build.0 = Debug|Win32

+		{3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}.Debug|x64.ActiveCfg = Debug|x64

+		{3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}.Debug|x64.Build.0 = Debug|x64

+		{3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}.Release|Win32.ActiveCfg = Release|Win32

+		{3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}.Release|Win32.Build.0 = Release|Win32

+		{3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}.Release|x64.ActiveCfg = Release|x64

+		{3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

@@ -146,5 +184,8 @@ Global
 		{AE0A9E7C-9A41-9F0D-432E-85102F441B0F} = {9892E17D-8434-0C54-6DEF-1FA8593093A4}

 		{3F16CDE1-AB80-8158-F4BE-32FE60685FAD} = {9892E17D-8434-0C54-6DEF-1FA8593093A4}

 		{69185F10-D52C-87C1-9EAE-2A210A8283F2} = {9892E17D-8434-0C54-6DEF-1FA8593093A4}

+		{A41847E7-90D0-8834-F9D7-6190E5AE2325} = {5EF0341D-CACF-B3B8-D3E7-3E8F3F461A1A}

+		{8BDD0170-F7BC-800B-00D5-0BE26C33E76C} = {5EF0341D-CACF-B3B8-D3E7-3E8F3F461A1A}

+		{3AED02FA-26BA-5D05-4FD3-4BAD3BFF9293} = {5EF0341D-CACF-B3B8-D3E7-3E8F3F461A1A}

 	EndGlobalSection

 EndGlobal

diff --git a/JSImpl/solution/Makefile b/JSImpl/solution/Makefile
index 45157d1..78a826a 100644
--- a/JSImpl/solution/Makefile
+++ b/JSImpl/solution/Makefile
@@ -6,7 +6,7 @@ ifndef config
 endif
 export config
 
-PROJECTS := JSImpl JSLib Test gmock gtest gtest_main spasm spasm_lib sprt sprun
+PROJECTS := JSImpl JSLib Test dummy_gc gmock gtest gtest_main leak_gc spasm spasm_lib sprt sprun test_bench
 
 .PHONY: all clean help $(PROJECTS)
 
@@ -52,6 +52,18 @@ sprun: sprt
 	@echo "==== Building sprun ($(config)) ===="
 	@${MAKE} --no-print-directory -C ../../spasm/solution -f sprun.make
 
+test_bench: 
+	@echo "==== Building test_bench ($(config)) ===="
+	@${MAKE} --no-print-directory -C ../../gctest/solution -f test_bench.make
+
+leak_gc: test_bench
+	@echo "==== Building leak_gc ($(config)) ===="
+	@${MAKE} --no-print-directory -C ../../gctest/solution -f leak_gc.make
+
+dummy_gc: test_bench
+	@echo "==== Building dummy_gc ($(config)) ===="
+	@${MAKE} --no-print-directory -C ../../gctest/solution -f dummy_gc.make
+
 clean:
 	@${MAKE} --no-print-directory -C ../test -f Test.make clean
 	@${MAKE} --no-print-directory -C ../test -f gtest.make clean
@@ -63,6 +75,9 @@ clean:
 	@${MAKE} --no-print-directory -C ../../spasm/solution -f spasm_lib.make clean
 	@${MAKE} --no-print-directory -C ../../spasm/solution -f spasm.make clean
 	@${MAKE} --no-print-directory -C ../../spasm/solution -f sprun.make clean
+	@${MAKE} --no-print-directory -C ../../gctest/solution -f test_bench.make clean
+	@${MAKE} --no-print-directory -C ../../gctest/solution -f leak_gc.make clean
+	@${MAKE} --no-print-directory -C ../../gctest/solution -f dummy_gc.make clean
 
 help:
 	@echo "Usage: make [config=name] [target]"
@@ -86,5 +101,8 @@ help:
 	@echo "   spasm_lib"
 	@echo "   spasm"
 	@echo "   sprun"
+	@echo "   test_bench"
+	@echo "   leak_gc"
+	@echo "   dummy_gc"
 	@echo ""
 	@echo "For more information, see https://github.com/bkaradzic/genie"
diff --git a/JSImpl/solution/genie.lua b/JSImpl/solution/genie.lua
index e3720a4..5d36fc8 100644
--- a/JSImpl/solution/genie.lua
+++ b/JSImpl/solution/genie.lua
@@ -49,3 +49,6 @@ solution 'JSImpl'
 
     group 'Spasm'
         include '../../spasm/solution/'
+
+    group 'gctest'
+        include '../../gctest/solution/'