build: Explicitly list cpptest source files.

peter-b · peter-b · commit aea420f2e73e · 2015-10-27T14:43:33.000Z
This is because I couldn't find a completely portable command to list files
matching a specific pattern in a subdirectory (or even a decent substitute on
Windows for `ls -1 path/to/*.cpp`).

This isn't a massive loss because we already explicitly list all of our other
C++ source files.
diff --git a/config/cpptest.gypi b/config/cpptest.gypi
@@ -2,7 +2,7 @@
 	'variables':
 	{
 		'module_test_dependencies%': '',
-		'module_test_additional_sources%': '',
+		'module_test_sources%': '',
 		'module_test_include_dirs%': '',
 		'module_test_defines%': '',
 	},
@@ -33,8 +33,7 @@
 
 			'sources':
 			[
-				'<!@(ls -1 test/*.cpp)',
-				'<@(module_test_additional_sources)',
+				'<@(module_test_sources)',
 			],
 
 			'include_dirs': [ '<@(module_test_include_dirs)', ],
diff --git a/engine/engine-sources.gypi b/engine/engine-sources.gypi
@@ -964,6 +964,13 @@
 		[
 			'src/browser.lcb',
 		],
+
+		# Engine cpptest source files
+		'engine_test_source_files':
+		[
+			'test/test_lextable.cpp',
+			'test/test_new.cpp',
+		],
 	},
 	
 	'target_defaults':
diff --git a/engine/kernel-development.gyp b/engine/kernel-development.gyp
@@ -9,8 +9,9 @@
 			'../libfoundation/libfoundation.gyp:libFoundation',
 			'../libgraphics/libgraphics.gyp:libGraphics',
 		],
-		'module_test_additional_sources':
+		'module_test_sources':
 		[
+			'<@(engine_test_source_files)',
 			'<(SHARED_INTERMEDIATE_DIR)/src/startupstack.cpp',
 		],
 		'module_test_include_dirs':
diff --git a/engine/kernel-installer.gyp b/engine/kernel-installer.gyp
@@ -15,6 +15,10 @@
 			'src',
 		],
 		'module_test_defines': [ 'MODE_INSTALLER', ],
+		'module_test_sources':
+		[
+			'<@(engine_test_source_files)',
+		],
 	},
 
 	'includes':
diff --git a/engine/kernel-server.gyp b/engine/kernel-server.gyp
@@ -8,9 +8,10 @@
 			'../libfoundation/libfoundation.gyp:libFoundation',
 			'../libgraphics/libgraphics.gyp:libGraphics',
 		],
-		'module_test_additional_sources':
+		'module_test_sources':
 		[
-			'<@(engine_security_source_files)'
+			'<@(engine_test_source_files)',
+			'<@(engine_security_source_files)',
 		],
 		'module_test_include_dirs':
 		[
diff --git a/engine/kernel-standalone.gyp b/engine/kernel-standalone.gyp
@@ -15,6 +15,10 @@
 			'src',
 		],
 		'module_test_defines': [ 'MODE_STANDALONE', ],
+		'module_test_sources':
+		[
+			'<@(engine_test_source_files)',
+		],
 	},
 
 	'includes':
diff --git a/libcpptest/libcpptest.gyp b/libcpptest/libcpptest.gyp
@@ -2,6 +2,10 @@
 	'variables':
 	{
 		'module_name': 'libcpptest',
+		'module_test_sources':
+		[
+			'test/trivial.cpp',
+		],
 	},
 
 	'includes':
diff --git a/libfoundation/libfoundation.gyp b/libfoundation/libfoundation.gyp
@@ -6,6 +6,11 @@
 		[
 			'libFoundation',
 		],
+		'module_test_sources':
+		[
+			'test/environment.cpp',
+			'test/test_string.cpp',
+		],
 	},
 
 

Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,10 @@`
`8`	`8`	`'../libfoundation/libfoundation.gyp:libFoundation',`
`9`	`9`	`'../libgraphics/libgraphics.gyp:libGraphics',`
`10`	`10`	`],`
`11`		`- 'module_test_additional_sources':`
	`11`	`+ 'module_test_sources':`
`12`	`12`	`[`
`13`		`- '<@(engine_security_source_files)'`
	`13`	`+ '<@(engine_test_source_files)',`
	`14`	`+ '<@(engine_security_source_files)',`
`14`	`15`	`],`
`15`	`16`	`'module_test_include_dirs':`
`16`	`17`	`[`