* Build fix for GCC4.

* Use printf() instead of the std::cout stuff.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39672 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2010-11-29 18:05:32 +00:00
parent 4d41072817
commit d463afccb1
2 changed files with 14 additions and 18 deletions
+11 -16
View File
@@ -4,7 +4,7 @@
*/ */
#include <iostream> #include <stdio.h>
#include <SemaphoreSyncObject.h> #include <SemaphoreSyncObject.h>
#include <Directory.h> #include <Directory.h>
@@ -12,7 +12,7 @@
#include "UnitTester.h" #include "UnitTester.h"
UnitTesterShell::UnitTesterShell(const string &description, UnitTesterShell::UnitTesterShell(const std::string &description,
SyncObject *syncObject) SyncObject *syncObject)
: :
BTestShell(description, syncObject) BTestShell(description, syncObject)
@@ -23,13 +23,9 @@ UnitTesterShell::UnitTesterShell(const string &description,
void void
UnitTesterShell::PrintDescription(int argc, char *argv[]) UnitTesterShell::PrintDescription(int argc, char *argv[])
{ {
string AppName = argv[0]; printf("This program is the central testing framework for the purpose\n"
cout << endl; "of testing and verifying the various kits, classes, functions,\n"
cout << "This program is the central testing framework for the purpose" "and the like that comprise Haiku.\n");
<< endl;
cout << "of testing and verifying the various kits, classes, functions,"
<< endl;
cout << "and the like that comprise Haiku." << endl;
} }
@@ -37,12 +33,11 @@ void
UnitTesterShell::PrintValidArguments() UnitTesterShell::PrintValidArguments()
{ {
BTestShell::PrintValidArguments(); BTestShell::PrintValidArguments();
cout << indent << "-haiku Runs tests linked against our Haiku " printf("\t-haiku Runs tests linked against our Haiku "
"libraries (*default*)" << endl; "libraries (*default*)\n"
cout << indent << "-r5 Runs tests linked against Be Inc.'s R5 " "\t-r5 Runs tests linked against Be Inc.'s R5 "
"libraries (instead" << endl; "libraries (instead\n"
cout << indent << " of our libraries) for the sake of " "\t of our libraries) for the sake of comparison.\n");
"comparison." << endl;
} }
@@ -50,7 +45,7 @@ void
UnitTesterShell::LoadDynamicSuites() UnitTesterShell::LoadDynamicSuites()
{ {
// Add the appropriate test lib path // Add the appropriate test lib path
string defaultLibDir = string(GlobalTestDir()) + "/lib"; std::string defaultLibDir = std::string(GlobalTestDir()) + "/lib";
fLibDirs.insert(defaultLibDir); fLibDirs.insert(defaultLibDir);
// Load away // Load away
+3 -2
View File
@@ -13,8 +13,9 @@
class UnitTesterShell : public BTestShell { class UnitTesterShell : public BTestShell {
public: public:
UnitTesterShell(const string &description = "", UnitTesterShell(
SyncObject *syncObject = 0); const std::string &description = "",
SyncObject *syncObject = NULL);
protected: protected:
virtual void PrintDescription(int argc, char *argv[]); virtual void PrintDescription(int argc, char *argv[]);