[ros-diffs] [chorns] 19487: Fix building rbuild tests

Fix building rbuild tests
Modified: trunk/reactos/tools/rbuild/tests/cdfiletest.cpp
Modified: trunk/reactos/tools/rbuild/tests/compilationunittest.cpp
Modified: trunk/reactos/tools/rbuild/tests/data/compilationunit.xml
Modified: trunk/reactos/tools/rbuild/tests/definetest.cpp
Modified: trunk/reactos/tools/rbuild/tests/iftest.cpp
Modified: trunk/reactos/tools/rbuild/tests/includetest.cpp
Modified: trunk/reactos/tools/rbuild/tests/invoketest.cpp
Modified: trunk/reactos/tools/rbuild/tests/linkerflagtest.cpp
Modified: trunk/reactos/tools/rbuild/tests/moduletest.cpp
Modified: trunk/reactos/tools/rbuild/tests/projecttest.cpp
Modified: trunk/reactos/tools/rbuild/tests/sourcefiletest.cpp
Modified: trunk/reactos/tools/rbuild/tests/symboltest.cpp
  _____  

Modified: trunk/reactos/tools/rbuild/tests/cdfiletest.cpp
--- trunk/reactos/tools/rbuild/tests/cdfiletest.cpp	2005-11-23
15:05:53 UTC (rev 19486)
+++ trunk/reactos/tools/rbuild/tests/cdfiletest.cpp	2005-11-23
15:16:18 UTC (rev 19487)
@@ -22,7 +22,8 @@

 void CDFileTest::Run()
 {
 	string projectFilename ( RBUILD_BASE "tests/data/cdfile.xml" );
-	Project project( projectFilename );
+	Configuration configuration;
+	Project project ( configuration, projectFilename );
 	ARE_EQUAL ( 3, project.cdfiles.size () );
 
 	CDFile& cdfile1 = *project.cdfiles[0];
  _____  

Modified: trunk/reactos/tools/rbuild/tests/compilationunittest.cpp
--- trunk/reactos/tools/rbuild/tests/compilationunittest.cpp
2005-11-23 15:05:53 UTC (rev 19486)
+++ trunk/reactos/tools/rbuild/tests/compilationunittest.cpp
2005-11-23 15:16:18 UTC (rev 19487)
@@ -22,7 +22,8 @@

 void CompilationUnitTest::Run()
 {
 	string projectFilename ( RBUILD_BASE
"tests/data/compilationunit.xml" );
-	Project project ( projectFilename );
+	Configuration configuration;
+	Project project ( configuration, projectFilename );
 	ARE_EQUAL ( 1, project.modules.size () );
 
 	Module& module1 = *project.modules[0];
  _____  

Modified: trunk/reactos/tools/rbuild/tests/data/compilationunit.xml
--- trunk/reactos/tools/rbuild/tests/data/compilationunit.xml
2005-11-23 15:05:53 UTC (rev 19486)
+++ trunk/reactos/tools/rbuild/tests/data/compilationunit.xml
2005-11-23 15:16:18 UTC (rev 19487)
@@ -2,7 +2,7 @@

 <project name="Project" makefile="Makefile">
 	<directory name="dir1">
 		<module name="module1" type="buildtool">
-			<compilationunit>
+			<compilationunit name="module1_unit.c">
 				<file>file1.c</file>
 				<file>file2.c</file>
 			</compilationunit>
  _____  

Modified: trunk/reactos/tools/rbuild/tests/definetest.cpp
--- trunk/reactos/tools/rbuild/tests/definetest.cpp	2005-11-23
15:05:53 UTC (rev 19486)
+++ trunk/reactos/tools/rbuild/tests/definetest.cpp	2005-11-23
15:16:18 UTC (rev 19487)
@@ -22,7 +22,8 @@

 void DefineTest::Run()
 {
 	string projectFilename ( RBUILD_BASE "tests/data/define.xml" );
-	Project project ( projectFilename );
+	Configuration configuration;
+	Project project ( configuration, projectFilename );
 	ARE_EQUAL(1, project.non_if_data.defines.size());
 	Define& define1 = *project.non_if_data.defines[0];
 	ARE_EQUAL("define1", define1.name);
  _____  

Modified: trunk/reactos/tools/rbuild/tests/iftest.cpp
--- trunk/reactos/tools/rbuild/tests/iftest.cpp	2005-11-23 15:05:53 UTC
(rev 19486)
+++ trunk/reactos/tools/rbuild/tests/iftest.cpp	2005-11-23 15:16:18 UTC
(rev 19487)
@@ -60,7 +60,8 @@

 IfTest::Run ()
 {
 	string projectFilename ( RBUILD_BASE "tests/data/if.xml" );
-	Project project ( projectFilename );
+	Configuration configuration;
+	Project project ( configuration, projectFilename );
 
 	TestProjectIf ( project );
 	TestModuleIf ( project );
  _____  

Modified: trunk/reactos/tools/rbuild/tests/includetest.cpp
--- trunk/reactos/tools/rbuild/tests/includetest.cpp	2005-11-23
15:05:53 UTC (rev 19486)
+++ trunk/reactos/tools/rbuild/tests/includetest.cpp	2005-11-23
15:16:18 UTC (rev 19487)
@@ -22,7 +22,8 @@

 void IncludeTest::Run()
 {
 	string projectFilename ( RBUILD_BASE "tests/data/include.xml" );
-	Project project ( projectFilename );
+	Configuration configuration;
+	Project project ( configuration, projectFilename );
 	ARE_EQUAL(1, project.non_if_data.includes.size());
 	Include& include1 = *project.non_if_data.includes[0];
 	ARE_EQUAL("include1", include1.directory);
  _____  

Modified: trunk/reactos/tools/rbuild/tests/invoketest.cpp
--- trunk/reactos/tools/rbuild/tests/invoketest.cpp	2005-11-23
15:05:53 UTC (rev 19486)
+++ trunk/reactos/tools/rbuild/tests/invoketest.cpp	2005-11-23
15:16:18 UTC (rev 19487)
@@ -22,7 +22,8 @@

 void InvokeTest::Run()
 {
 	string projectFilename ( RBUILD_BASE "tests/data/invoke.xml" );
-	Project project ( projectFilename );
+	Configuration configuration;
+	Project project ( configuration, projectFilename );
 	ARE_EQUAL(1, project.modules.size());
 
 	Module& module1 = *project.modules[0];
  _____  

Modified: trunk/reactos/tools/rbuild/tests/linkerflagtest.cpp
--- trunk/reactos/tools/rbuild/tests/linkerflagtest.cpp	2005-11-23
15:05:53 UTC (rev 19486)
+++ trunk/reactos/tools/rbuild/tests/linkerflagtest.cpp	2005-11-23
15:16:18 UTC (rev 19487)
@@ -22,7 +22,8 @@

 void LinkerFlagTest::Run()
 {
 	string projectFilename ( RBUILD_BASE "tests/data/linkerflag.xml"
);
-	Project project ( projectFilename );
+	Configuration configuration;
+	Project project ( configuration, projectFilename );
 	ARE_EQUAL(1, project.linkerFlags.size());
 	LinkerFlag& linkerFlag1 = *project.linkerFlags[0];
 	ARE_EQUAL("-lgcc1", linkerFlag1.flag);
  _____  

Modified: trunk/reactos/tools/rbuild/tests/moduletest.cpp
--- trunk/reactos/tools/rbuild/tests/moduletest.cpp	2005-11-23
15:05:53 UTC (rev 19486)
+++ trunk/reactos/tools/rbuild/tests/moduletest.cpp	2005-11-23
15:16:18 UTC (rev 19487)
@@ -22,7 +22,8 @@

 void ModuleTest::Run()
 {
 	string projectFilename ( RBUILD_BASE "tests/data/module.xml" );
-	Project project ( projectFilename );
+	Configuration configuration;
+	Project project ( configuration, projectFilename );
 	ARE_EQUAL(2, project.modules.size());
 
 	Module& module1 = *project.modules[0];
  _____  

Modified: trunk/reactos/tools/rbuild/tests/projecttest.cpp
--- trunk/reactos/tools/rbuild/tests/projecttest.cpp	2005-11-23
15:05:53 UTC (rev 19486)
+++ trunk/reactos/tools/rbuild/tests/projecttest.cpp	2005-11-23
15:16:18 UTC (rev 19487)
@@ -22,6 +22,7 @@

 void ProjectTest::Run()
 {
 	string projectFilename ( RBUILD_BASE "tests/data/project.xml" );
-	Project project( projectFilename );
+	Configuration configuration;
+	Project project ( configuration, projectFilename );
 	ARE_EQUAL(2, project.modules.size());
 }
  _____  

Modified: trunk/reactos/tools/rbuild/tests/sourcefiletest.cpp
--- trunk/reactos/tools/rbuild/tests/sourcefiletest.cpp	2005-11-23
15:05:53 UTC (rev 19486)
+++ trunk/reactos/tools/rbuild/tests/sourcefiletest.cpp	2005-11-23
15:16:18 UTC (rev 19487)
@@ -51,7 +51,9 @@

 void
 SourceFileTest::IncludeTest ()
 {
-	const Project project ( RBUILD_BASE "tests" SSEP "data" SSEP
"automaticdependency_include.xml" );
+	const string projectFilename = RBUILD_BASE "tests" SSEP "data"
SSEP "automaticdependency_include.xml";
+	Configuration configuration;
+	Project project ( configuration, projectFilename );
 	AutomaticDependency automaticDependency ( project );
 	automaticDependency.ParseFiles ();
 	ARE_EQUAL( 4, automaticDependency.sourcefile_map.size () );
@@ -64,7 +66,9 @@
 void
 SourceFileTest::FullParseTest ()
 {
-	const Project project ( RBUILD_BASE "tests" SSEP "data" SSEP
"automaticdependency.xml" );
+	const string projectFilename = RBUILD_BASE "tests" SSEP "data"
SSEP "automaticdependency.xml";
+	Configuration configuration;
+	Project project ( configuration, projectFilename );
 	AutomaticDependency automaticDependency ( project );
 	automaticDependency.ParseFiles ();
 	ARE_EQUAL( 5, automaticDependency.sourcefile_map.size () );
  _____  

Modified: trunk/reactos/tools/rbuild/tests/symboltest.cpp
--- trunk/reactos/tools/rbuild/tests/symboltest.cpp	2005-11-23
15:05:53 UTC (rev 19486)
+++ trunk/reactos/tools/rbuild/tests/symboltest.cpp	2005-11-23
15:16:18 UTC (rev 19487)
@@ -22,7 +22,8 @@

 void SymbolTest::Run()
 {
 	string projectFilename ( RBUILD_BASE "tests/data/symbol.xml" );
-	Project project ( projectFilename );
+	Configuration configuration;
+	Project project ( configuration, projectFilename );
 	
 	ARE_EQUAL ( 1, project.modules.size () );
 	Module& module1 = *project.modules[0];