ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 12:23:31 +00:00
Code Issues Packages Projects Releases 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
reactos/tools/rbuild/tests/cdfiletest.cpp
+2 -1
View File
@@ -22,7 +22,8 @@ using std::string;
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];
reactos/tools/rbuild/tests/compilationunittest.cpp
+2 -1
View File
@@ -22,7 +22,8 @@ using std::string;
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];
reactos/tools/rbuild/tests/data/compilationunit.xml
+1 -1
View File
@@ -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>
reactos/tools/rbuild/tests/definetest.cpp
+2 -1
View File
@@ -22,7 +22,8 @@ using std::string;
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);
reactos/tools/rbuild/tests/iftest.cpp
+2 -1
View File
@@ -60,7 +60,8 @@ void
IfTest::Run ()
{
string projectFilename ( RBUILD_BASE "tests/data/if.xml" );
Project project ( projectFilename );
Configuration configuration;
Project project ( configuration, projectFilename );
TestProjectIf ( project );
TestModuleIf ( project );
reactos/tools/rbuild/tests/includetest.cpp
+2 -1
View File
@@ -22,7 +22,8 @@ using std::string;
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);
reactos/tools/rbuild/tests/invoketest.cpp
+2 -1
View File
@@ -22,7 +22,8 @@ using std::string;
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];
reactos/tools/rbuild/tests/linkerflagtest.cpp
+2 -1
View File
@@ -22,7 +22,8 @@ using std::string;
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);
reactos/tools/rbuild/tests/moduletest.cpp
+2 -1
View File
@@ -22,7 +22,8 @@ using std::string;
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];
reactos/tools/rbuild/tests/projecttest.cpp
+2 -1
View File
@@ -22,6 +22,7 @@ using std::string;
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());
}
reactos/tools/rbuild/tests/sourcefiletest.cpp
+6 -2
View File
@@ -51,7 +51,9 @@ SourceFileTest::IsParentOf ( const SourceFile* parent,
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 @@ SourceFileTest::IncludeTest ()
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 () );
reactos/tools/rbuild/tests/symboltest.cpp
+2 -1
View File
@@ -22,7 +22,8 @@ using std::string;
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];