9 files changed, 26 insertions, 7 deletions

diff --git a/tests/LoadablePieces/Bindings.h b/tests/Generating/Bindings.h
index 490830ac3..490830ac3 100644
--- a/tests/LoadablePieces/Bindings.h
+++ b/tests/Generating/Bindings.h
diff --git a/tests/PieceRotation/CMakeLists.txt b/tests/Generating/CMakeLists.txt
index bb1b37a53..4efb9dbe2 100644
--- a/tests/PieceRotation/CMakeLists.txt
+++ b/tests/Generating/CMakeLists.txt
@@ -65,8 +65,7 @@ set (SHARED_HDRS
 	${CMAKE_SOURCE_DIR}/src/WorldStorage/SchematicFileSerializer.h
 )
 
-set (SRCS
-	PieceRotationTest.cpp
+set (STUBS
 	Stubs.cpp
 	LuaState_Typedefs.inc
 	LuaState_Declaration.inc
@@ -86,17 +85,37 @@ if (MSVC)
 	list (APPEND SHARED_HDRS ${CMAKE_SOURCE_DIR}/src/LeakFinder.h   ${CMAKE_SOURCE_DIR}/src/StackWalker.h)
 endif()
 
-source_group("Shared" FILES ${SHARED_SRCS} ${SHARED_HDRS})
-source_group("Sources" FILES ${SRCS})
-add_executable(PieceRotation ${SRCS} ${SHARED_SRCS} ${SHARED_HDRS})
-target_link_libraries(PieceRotation tolualib zlib)
+add_library(GeneratorTestingSupport STATIC ${SHARED_SRCS} ${SHARED_HDRS} ${STUBS})
+target_link_libraries(GeneratorTestingSupport tolualib zlib)
+source_group("Stubs" FILES ${STUBS})
+
+
+
+
+
+# LoadablePieces test:
+source_group("Data files" FILES Test.cubeset Test1.schematic)
+add_executable(LoadablePieces LoadablePieces.cpp Test.cubeset Test1.schematic)
+target_link_libraries(LoadablePieces GeneratorTestingSupport)
+add_test(NAME LoadablePieces-test WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND LoadablePieces)
+
+
+
+
+
+# PieceRotation test:
+add_executable(PieceRotation PieceRotationTest.cpp)
+target_link_libraries(PieceRotation GeneratorTestingSupport)
 add_test(NAME PieceRotation-test WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND PieceRotation)
 
 
 
 
+
 # Put the projects into solution folders (MSVC):
 set_target_properties(
+	GeneratorTestingSupport
+	LoadablePieces
 	PieceRotation
-	PROPERTIES FOLDER Tests
+	PROPERTIES FOLDER Tests/Generating
 )
diff --git a/tests/LoadablePieces/LoadablePieces.cpp b/tests/Generating/LoadablePieces.cpp
index 58b65464d..58b65464d 100644
--- a/tests/LoadablePieces/LoadablePieces.cpp
+++ b/tests/Generating/LoadablePieces.cpp
diff --git a/tests/LoadablePieces/LuaState_Declaration.inc b/tests/Generating/LuaState_Declaration.inc
index 4019b26c6..4019b26c6 100644
--- a/tests/LoadablePieces/LuaState_Declaration.inc
+++ b/tests/Generating/LuaState_Declaration.inc
diff --git a/tests/LoadablePieces/LuaState_Typedefs.inc b/tests/Generating/LuaState_Typedefs.inc
index 5eba7c6f8..5eba7c6f8 100644
--- a/tests/LoadablePieces/LuaState_Typedefs.inc
+++ b/tests/Generating/LuaState_Typedefs.inc
diff --git a/tests/PieceRotation/PieceRotationTest.cpp b/tests/Generating/PieceRotationTest.cpp
index ace3bd489..ace3bd489 100644
--- a/tests/PieceRotation/PieceRotationTest.cpp
+++ b/tests/Generating/PieceRotationTest.cpp
diff --git a/tests/LoadablePieces/Stubs.cpp b/tests/Generating/Stubs.cpp
index 0ad3eb365..0ad3eb365 100644
--- a/tests/LoadablePieces/Stubs.cpp
+++ b/tests/Generating/Stubs.cpp
diff --git a/tests/LoadablePieces/Test.cubeset b/tests/Generating/Test.cubeset
index 956e6684e..956e6684e 100644
--- a/tests/LoadablePieces/Test.cubeset
+++ b/tests/Generating/Test.cubeset
diff --git a/tests/LoadablePieces/Test1.schematic b/tests/Generating/Test1.schematic
index 6fe19e9db..6fe19e9db 100644
--- a/tests/LoadablePieces/Test1.schematic
+++ b/tests/Generating/Test1.schematic