Bug 619350 - Better identify the 2 'Deadlock detector correctness' tests; (Av1) Remove unwanted ";" at end of macros, Make test names and (failed) result logs more explicit, Add a log when skipping TestDeadlockDetectorScalability tests.

r=jones.chris.g a=(test only).
This commit is contained in:
Serge Gautherie 2011-02-03 10:57:00 +01:00
parent aa12f648c9
commit 5fe584f0a6
4 changed files with 25 additions and 23 deletions

View File

@ -106,14 +106,13 @@ spawn(void (*run)(void*), void* arg)
do { \
passed(__FUNCTION__); \
return NS_OK; \
} while (0);
} while (0)
#define FAIL(why) \
do { \
fail(why); \
fail("%s | %s - %s", __FILE__, __FUNCTION__, why); \
return NS_ERROR_FAILURE; \
} while (0);
} while (0)
//-----------------------------------------------------------------------------
@ -611,7 +610,7 @@ main(int argc, char** argv)
FAIL("unknown child test");
}
ScopedXPCOM xpcom("Deadlock detector correctness");
ScopedXPCOM xpcom("Storage deadlock detector correctness (" __FILE__ ")");
if (xpcom.failed())
return 1;

View File

@ -68,14 +68,13 @@ spawn(void (*run)(void*), void* arg)
do { \
passed(__FUNCTION__); \
return NS_OK; \
} while (0);
} while (0)
#define FAIL(why) \
do { \
fail(why); \
fail("%s | %s - %s", __FILE__, __FUNCTION__, why); \
return NS_ERROR_FAILURE; \
} while (0);
} while (0)
//-----------------------------------------------------------------------------
@ -573,7 +572,7 @@ main(int argc, char** argv)
FAIL("unknown child test");
}
ScopedXPCOM xpcom("Deadlock detector correctness");
ScopedXPCOM xpcom("XPCOM deadlock detector correctness (" __FILE__ ")");
if (xpcom.failed())
return 1;

View File

@ -45,14 +45,13 @@
do { \
passed(__FUNCTION__); \
return NS_OK; \
} while (0);
} while (0)
#define FAIL(why) \
do { \
fail(why); \
fail("%s | %s - %s", __FILE__, __FUNCTION__, why); \
return NS_ERROR_FAILURE; \
} while (0);
} while (0)
#ifdef OLD_API
# include "nsAutoLock.h"
@ -191,7 +190,7 @@ MaxDepsNsq(const int N, const int K)
int
main(int argc, char** argv)
{
ScopedXPCOM xpcom("Deadlock detector scalability");
ScopedXPCOM xpcom("Deadlock detector scalability (" __FILE__ ")");
if (xpcom.failed())
return 1;
@ -199,17 +198,23 @@ main(int argc, char** argv)
// Uncomment these tests to run them. Not expected to be common.
#ifdef DD_TEST1
#ifndef DD_TEST1
puts("Skipping not-requested LengthNDepChain() test");
#else
if (NS_FAILED(LengthNDepChain(1 << 14))) // 16K
rv = 1;
#endif
#ifdef DD_TEST2
#ifndef DD_TEST2
puts("Skipping not-requested OneLockNDeps() test");
#else
if (NS_FAILED(OneLockNDeps(1 << 14, 100))) // 16k
rv = 1;
#endif
#ifdef DD_TEST3
#ifndef DD_TEST3
puts("Skipping not-requested MaxDepsNsq() test");
#else
if (NS_FAILED(MaxDepsNsq(1 << 10, 10))) // 1k
rv = 1;
#endif

View File

@ -63,14 +63,13 @@ spawn(void (*run)(void*), void* arg)
do { \
passed(__FUNCTION__); \
return NS_OK; \
} while (0);
} while (0)
#define FAIL(why) \
do { \
fail(why); \
fail("%s | %s - %s", __FILE__, __FUNCTION__, why); \
return NS_ERROR_FAILURE; \
} while (0);
} while (0)
//-----------------------------------------------------------------------------
// Sanity check: tests that can be done on a single thread
@ -392,7 +391,7 @@ AutoMonitor()
int
main(int argc, char** argv)
{
ScopedXPCOM xpcom("Synchronization");
ScopedXPCOM xpcom("Synchronization (" __FILE__ ")");
if (xpcom.failed())
return 1;