diff options
| author | Steve Huston <shuston@riverace.com> | 2010-12-07 15:52:14 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2010-12-07 15:52:14 +0000 |
| commit | 0128f12452961a6996c1d86c802c93bbc2462fa0 (patch) | |
| tree | 5cd380e538add7cf90b2c725c322235a690e95db | |
| parent | ba44fcd1734de05b92c6b8d11a418bbbea06d244 (diff) | |
| download | ATCD-0128f12452961a6996c1d86c802c93bbc2462fa0.tar.gz | |
ChangeLogTag:Tue Dec 7 15:52:02 UTC 2010 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ACE/ChangeLog | 8 | ||||
| -rw-r--r-- | ACE/tests/Atomic_Op_Test.cpp | 24 |
2 files changed, 24 insertions, 8 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 9adf3f38a87..d2b512c4f9b 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,11 @@ +Tue Dec 7 15:52:02 UTC 2010 Steve Huston <shuston@riverace.com> + + * tests/Atomic_Op_Test.cpp: For platforms w/o built-in atomic op + support, run fewer iterations of the test loop. Those platforms + sometimes time out during regression tests. This was a problem + with Riverace's PA-RISC box so if this change causes problems + otherwise, please let me know. + Mon Dec 6 15:59:52 UTC 2010 Adam Mitz <mitza@ociweb.com> * bin/make_release.py: diff --git a/ACE/tests/Atomic_Op_Test.cpp b/ACE/tests/Atomic_Op_Test.cpp index 2570b6226e1..d0109b6093a 100644 --- a/ACE/tests/Atomic_Op_Test.cpp +++ b/ACE/tests/Atomic_Op_Test.cpp @@ -249,17 +249,25 @@ run_main (int, ACE_TCHAR *[]) { ACE_START_TEST (ACE_TEXT ("Atomic_Op_Test")); + // Some platforms w/o builtin atomic ops time out the regression tests, + // so run fewer iterations there. +#if defined (ACE_HAS_BUILTIN_ATOMIC_OP) + const int ITERATIONS = 1000000; +#else + const int ITERATIONS = 100000; +#endif /* ACE_HAS_BUILTIN_ATOMIC_OP */ + int retval = 0; - retval += test <int, int> (ACE_TEXT("int"), 1000000); - retval += test <long, int> (ACE_TEXT("long"), 1000000); - retval += test <unsigned int, int> (ACE_TEXT("unsigned int"), 1000000); - retval += test <unsigned long, int> (ACE_TEXT("unsigned long"), 1000000); - retval += test <short, int> (ACE_TEXT("short"), 10000); - retval += test <unsigned short, int> (ACE_TEXT("unsigned short"), 10000); - retval += test <bool> (ACE_TEXT("bool"), 1000000); + retval += test <int, int> (ACE_TEXT("int"), ITERATIONS); + retval += test <long, int> (ACE_TEXT("long"), ITERATIONS); + retval += test <unsigned int, int> (ACE_TEXT("unsigned int"), ITERATIONS); + retval += test <unsigned long, int> (ACE_TEXT("unsigned long"), ITERATIONS); + retval += test <short, int> (ACE_TEXT("short"), ITERATIONS); + retval += test <unsigned short, int> (ACE_TEXT("unsigned short"), ITERATIONS); + retval += test <bool> (ACE_TEXT("bool"), ITERATIONS); #if !defined (ACE_LACKS_LONGLONG_T) - retval += test <long long, int> (ACE_TEXT("long long"), 1000000); + retval += test <long long, int> (ACE_TEXT("long long"), ITERATIONS); #endif ACE_END_TEST; |