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

Make tests build again

Browse Source 
svn path=/branches/xmlbuildsystem/; revision=14003
This commit is contained in:
Casper Hornstrup
2005-03-13 10:33:15 +00:00
parent 9a2cf81bc4
commit 4c6320805b
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/tools/rbuild/tests/definetest.cpp
+4 -4
View File
@@ -6,16 +6,16 @@ void DefineTest::Run()
{
string projectFilename ( RBUILD_BASE "tests/data/define.xml" );
Project project ( projectFilename );
ARE_EQUAL(1, project.defines.size());
Define& define1 = *project.defines[0];
ARE_EQUAL(1, project.non_if_data.defines.size());
Define& define1 = *project.non_if_data.defines[0];
ARE_EQUAL("define1", define1.name);
ARE_EQUAL("value1", define1.value);
ARE_EQUAL(1, project.modules.size());
Module& module1 = *project.modules[0];
ARE_EQUAL(1, module1.defines.size());
Define& define2 = *module1.defines[0];
ARE_EQUAL(1, module1.non_if_data.defines.size());
Define& define2 = *module1.non_if_data.defines[0];
ARE_EQUAL("define2", define2.name);
ARE_EQUAL("value2", define2.value);
}
reactos/tools/rbuild/tests/iftest.cpp
+6 -6
View File
@@ -10,16 +10,16 @@ void IfTest::Run()
ARE_EQUAL ( 1, project.modules.size () );
Module& module1 = *project.modules[0];
ARE_EQUAL ( 1, module1.ifs.size () );
If& if1 = *module1.ifs[0];
ARE_EQUAL ( 1, module1.non_if_data.ifs.size () );
If& if1 = *module1.non_if_data.ifs[0];
ARE_EQUAL ( "VAR1", if1.property );
ARE_EQUAL ( "value1", if1.value );
ARE_EQUAL ( 1, if1.files.size () );
File& file1 = *if1.files[0];
ARE_EQUAL ( 1, if1.data.files.size () );
File& file1 = *if1.data.files[0];
ARE_EQUAL( "." SSEP "file1.c", file1.name );
ARE_EQUAL ( 1, module1.files.size () );
File& file2 = *module1.files[0];
ARE_EQUAL ( 1, module1.non_if_data.files.size () );
File& file2 = *module1.non_if_data.files[0];
ARE_EQUAL( "." SSEP "file2.c", file2.name );
}
reactos/tools/rbuild/tests/includetest.cpp
+6 -6
View File
@@ -6,19 +6,19 @@ void IncludeTest::Run()
{
string projectFilename ( RBUILD_BASE "tests/data/include.xml" );
Project project ( projectFilename );
ARE_EQUAL(1, project.includes.size());
Include& include1 = *project.includes[0];
ARE_EQUAL(1, project.non_if_data.includes.size());
Include& include1 = *project.non_if_data.includes[0];
ARE_EQUAL("include1", include1.directory);
ARE_EQUAL(2, project.modules.size());
Module& module1 = *project.modules[0];
Module& module2 = *project.modules[1];
ARE_EQUAL(1, module1.includes.size());
Include& include2 = *module1.includes[0];
ARE_EQUAL(1, module1.non_if_data.includes.size());
Include& include2 = *module1.non_if_data.includes[0];
ARE_EQUAL("include2", include2.directory);
ARE_EQUAL(1, module2.includes.size());
Include& include3 = *module2.includes[0];
ARE_EQUAL(1, module2.non_if_data.includes.size());
Include& include3 = *module2.non_if_data.includes[0];
ARE_EQUAL(FixSeparator("./dir1/include3"), include3.directory);
}
reactos/tools/rbuild/tests/moduletest.cpp
+9 -9
View File
@@ -10,20 +10,20 @@ void ModuleTest::Run()
Module& module1 = *project.modules[0];
IS_TRUE(module1.type == BuildTool);
ARE_EQUAL(2, module1.files.size());
ARE_EQUAL("." SSEP "dir1" SSEP "file1.c", module1.files[0]->name);
ARE_EQUAL("." SSEP "dir1" SSEP "file2.c", module1.files[1]->name);
ARE_EQUAL(2, module1.non_if_data.files.size());
ARE_EQUAL("." SSEP "dir1" SSEP "file1.c", module1.non_if_data.files[0]->name);
ARE_EQUAL("." SSEP "dir1" SSEP "file2.c", module1.non_if_data.files[1]->name);
ARE_EQUAL(0, module1.libraries.size());
ARE_EQUAL(0, module1.non_if_data.libraries.size());
Module& module2 = *project.modules[1];
IS_TRUE(module2.type == KernelModeDLL);
ARE_EQUAL(2, module2.files.size());
ARE_EQUAL("." SSEP "dir2" SSEP "file3.c", module2.files[0]->name);
ARE_EQUAL("." SSEP "dir2" SSEP "file4.c", module2.files[1]->name);
ARE_EQUAL(2, module2.non_if_data.files.size());
ARE_EQUAL("." SSEP "dir2" SSEP "file3.c", module2.non_if_data.files[0]->name);
ARE_EQUAL("." SSEP "dir2" SSEP "file4.c", module2.non_if_data.files[1]->name);
ARE_EQUAL(1, module2.libraries.size());
Library& library1 = *module2.libraries[0];
ARE_EQUAL(1, module2.non_if_data.libraries.size());
Library& library1 = *module2.non_if_data.libraries[0];
ARE_EQUAL("module1", library1.name);
ARE_EQUAL(1, module2.dependencies.size());