[haiku-commits] haiku: hrev47938 - src/tools/cppunit build/jam
- From: pulkomandy@xxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 1 Oct 2014 11:30:15 +0200 (CEST)
hrev47938 adds 2 changesets to branch 'master'
old head: 58844015bf1b021181636366bf474860b15a0064
new head: a8f520f2a879ce83582bc6b9d8206bb860ecedb8
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=a8f520f+%5E5884401
----------------------------------------------------------------------------
d5f1b89: jam TestRules: whitespace fixes.
a8f520f: Test harness: 64bit warnings fixes.
[ Adrien Destugues <pulkomandy@xxxxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 22 insertions(+), 8 deletions(-)
build/jam/TestsRules | 8 ++++++--
src/tools/cppunit/BTestCase.cpp | 2 +-
src/tools/cppunit/ThreadedTestCase.cpp | 20 +++++++++++++++-----
############################################################################
Commit: d5f1b898efb49c9fdeb410a127e2bd8f3e02590a
URL: http://cgit.haiku-os.org/haiku/commit/?id=d5f1b89
Author: Adrien Destugues <pulkomandy@xxxxxxxxx>
Date: Wed Oct 1 08:57:59 2014 UTC
jam TestRules: whitespace fixes.
----------------------------------------------------------------------------
diff --git a/build/jam/TestsRules b/build/jam/TestsRules
index 77ff5b0..68f67ee 100644
--- a/build/jam/TestsRules
+++ b/build/jam/TestsRules
@@ -20,7 +20,7 @@ rule UnitTestLib
# make the target depend on the installed libbe libraries
Depends $(lib) :
- <tests!unittests>libbe_test.so ;
+ <tests!unittests>libbe_test.so ;
} else {
ObjectDefines $(2) : TEST_HAIKU TEST_OBOS ;
}
@@ -33,6 +33,7 @@ rule UnitTestLib
Depends unittests : $(lib) ;
}
+
rule UnitTest
{
# UnitTest <target> : <sources> : <libraries> : <resources> ;
@@ -48,7 +49,7 @@ rule UnitTest
# make the target depend on the installed libbe libraries
Depends $(target) :
- <tests!unittests>libbe_test.so ;
+ <tests!unittests>libbe_test.so ;
} else {
ObjectDefines $(2) : TEST_HAIKU TEST_OBOS ;
}
@@ -62,6 +63,7 @@ rule UnitTest
Depends unittests : $(target) ;
}
+
rule TestObjects
{
# TestObjects <sources> ;
@@ -80,6 +82,7 @@ rule TestObjects
Objects $(sources) ;
}
+
rule SimpleTest
{
# SimpleTest <target> : <sources> : [ <libraries> ] : [ <resources> ] ;
@@ -92,6 +95,7 @@ rule SimpleTest
Executable $(1) : $(2) : $(3) : $(4) ;
}
+
rule BuildPlatformTest
{
# Usage BuildPlatformTest <target> : <sources> ;
############################################################################
Revision: hrev47938
Commit: a8f520f2a879ce83582bc6b9d8206bb860ecedb8
URL: http://cgit.haiku-os.org/haiku/commit/?id=a8f520f
Author: Adrien Destugues <pulkomandy@xxxxxxxxx>
Date: Wed Oct 1 08:59:07 2014 UTC
Test harness: 64bit warnings fixes.
----------------------------------------------------------------------------
diff --git a/src/tools/cppunit/BTestCase.cpp b/src/tools/cppunit/BTestCase.cpp
index 84dfd42..3a59f72 100644
--- a/src/tools/cppunit/BTestCase.cpp
+++ b/src/tools/cppunit/BTestCase.cpp
@@ -25,7 +25,7 @@ _EXPORT
void
BTestCase::NextSubTest() {
if (BTestShell::GlobalBeVerbose()) {
- printf("[%ld]", fSubTestNum++);
+ printf("[%" B_PRId32 "]", fSubTestNum++);
fflush(stdout);
}
}
diff --git a/src/tools/cppunit/ThreadedTestCase.cpp
b/src/tools/cppunit/ThreadedTestCase.cpp
index 0fcee86..cdc35cc 100644
--- a/src/tools/cppunit/ThreadedTestCase.cpp
+++ b/src/tools/cppunit/ThreadedTestCase.cpp
@@ -17,6 +17,7 @@ BThreadedTestCase::BThreadedTestCase(string name, string
progressSeparator)
{
}
+
_EXPORT
BThreadedTestCase::~BThreadedTestCase() {
// Kill our locker
@@ -24,13 +25,13 @@ BThreadedTestCase::~BThreadedTestCase() {
// Clean up
for (map<thread_id, ThreadSubTestInfo*>::iterator i =
fNumberMap.begin();
- i != fNumberMap.end();
- i++)
+ i != fNumberMap.end(); i++)
{
delete i->second;
}
}
+
_EXPORT
void
BThreadedTestCase::NextSubTest() {
@@ -45,8 +46,9 @@ BThreadedTestCase::NextSubTest() {
// Handle multi-threaded case
ThreadSubTestInfo *info = i->second;
char num[32];
- sprintf(num, "%ld", info->subTestNum++);
- string str = string("[") + info->name +
fProgressSeparator + num + "]";
+ sprintf(num, "%" B_PRId32 "", info->subTestNum++);
+ string str = string("[") + info->name +
fProgressSeparator + num
+ + "]";
fUpdateList.push_back(str);
return;
}
@@ -56,6 +58,7 @@ BThreadedTestCase::NextSubTest() {
BTestCase::NextSubTest();
}
+
_EXPORT
void
BThreadedTestCase::Outputf(const char *str, ...) {
@@ -76,7 +79,9 @@ BThreadedTestCase::Outputf(const char *str, ...) {
} else {
va_list args;
va_start(args, str);
- char msg[1024]; // Need a longer string? Change the
constant or change the function. :-)
+ char msg[1024];
+ // FIXME Need a longer string? Change the
constant or change the
+ // function. :-)
vsprintf(msg, str, args);
va_end(args);
{
@@ -88,6 +93,7 @@ BThreadedTestCase::Outputf(const char *str, ...) {
}
}
+
_EXPORT
void
BThreadedTestCase::InitThreadInfo(thread_id id, string threadName) {
@@ -105,6 +111,7 @@ BThreadedTestCase::InitThreadInfo(thread_id id, string
threadName) {
}
}
+
_EXPORT
bool
BThreadedTestCase::RegisterForUse() {
@@ -115,12 +122,14 @@ BThreadedTestCase::RegisterForUse() {
return false;
}
+
_EXPORT
void
BThreadedTestCase::UnregisterForUse() {
fInUse = false;
}
+
_EXPORT
vector<string>&
BThreadedTestCase::AcquireUpdateList() {
@@ -128,6 +137,7 @@ BThreadedTestCase::AcquireUpdateList() {
return fUpdateList;
}
+
_EXPORT
void
BThreadedTestCase::ReleaseUpdateList() {
Other related posts:
- » [haiku-commits] haiku: hrev47938 - src/tools/cppunit build/jam - pulkomandy
