Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 01:25:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix building rbuild tests

Browse source 
svn path=/trunk/; revision=19487
This commit is contained in:
Casper Hornstrup 2005-11-23 15:16:18 +00:00
parent f4e5a5a581
commit 6afed94a54
12 changed files with 27 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
reactos/tools/rbuild/tests/cdfiletest.cpp
View file

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

3
reactos/tools/rbuild/tests/compilationunittest.cpp
View file

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

2
reactos/tools/rbuild/tests/data/compilationunit.xml
View file

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

3
reactos/tools/rbuild/tests/definetest.cpp
View file

@ -22,7 +22,8 @@ using std::string;
void DefineTest::Run() void DefineTest::Run()
{ {
string projectFilename ( RBUILD_BASE "tests/data/define.xml" ); 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()); ARE_EQUAL(1, project.non_if_data.defines.size());
Define& define1 = *project.non_if_data.defines[0]; Define& define1 = *project.non_if_data.defines[0];
ARE_EQUAL("define1", define1.name); ARE_EQUAL("define1", define1.name);

3
reactos/tools/rbuild/tests/iftest.cpp
View file

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

3
reactos/tools/rbuild/tests/includetest.cpp
View file

@ -22,7 +22,8 @@ using std::string;
void IncludeTest::Run() void IncludeTest::Run()
{ {
string projectFilename ( RBUILD_BASE "tests/data/include.xml" ); 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()); ARE_EQUAL(1, project.non_if_data.includes.size());
Include& include1 = *project.non_if_data.includes[0]; Include& include1 = *project.non_if_data.includes[0];
ARE_EQUAL("include1", include1.directory); ARE_EQUAL("include1", include1.directory);

3
reactos/tools/rbuild/tests/invoketest.cpp
View file

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

3
reactos/tools/rbuild/tests/linkerflagtest.cpp
View file

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

3
reactos/tools/rbuild/tests/moduletest.cpp
View file

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

3
reactos/tools/rbuild/tests/projecttest.cpp
View file

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

8
reactos/tools/rbuild/tests/sourcefiletest.cpp
View file

@ -51,7 +51,9 @@ SourceFileTest::IsParentOf ( const SourceFile* parent,
void void
SourceFileTest::IncludeTest () 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 automaticDependency ( project );
automaticDependency.ParseFiles (); automaticDependency.ParseFiles ();
ARE_EQUAL( 4, automaticDependency.sourcefile_map.size () ); ARE_EQUAL( 4, automaticDependency.sourcefile_map.size () );
@ -64,7 +66,9 @@ SourceFileTest::IncludeTest ()
void void
SourceFileTest::FullParseTest () 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 automaticDependency ( project );
automaticDependency.ParseFiles (); automaticDependency.ParseFiles ();
ARE_EQUAL( 5, automaticDependency.sourcefile_map.size () ); ARE_EQUAL( 5, automaticDependency.sourcefile_map.size () );

3
reactos/tools/rbuild/tests/symboltest.cpp
View file

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