diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-11-13 15:25:23 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-11-13 15:25:23 +0000 |
| commit | 4a8658c3cda22915db1b4e765a36e2d345600eb5 (patch) | |
| tree | 15e9eb850c95e2348870e4a50fe49d779846f65b | |
| parent | f264cd6a1710919441228948f78c30c1435ee517 (diff) | |
| download | ATCD-4a8658c3cda22915db1b4e765a36e2d345600eb5.tar.gz | |
Thu Nov 13 15:25:30 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 8 | ||||
| -rw-r--r-- | ACE/tests/Logging_Strategy_Test.cpp | 17 | ||||
| -rw-r--r-- | ACE/tests/Service_Config_Test.cpp | 3 |
3 files changed, 17 insertions, 11 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 61af825c144..cf2c4b92e64 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,11 @@ +Thu Nov 13 15:25:30 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Service_Config_Test.cpp: + Just not give arguments a name if you don't need them + + * tests/Logging_Strategy_Test.cpp: + Use ACE_DEFAULT_TEST_DIR to get a full path on Windows CE + Thu Nov 13 14:56:30 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * bin/tao_orb_tests.lst: diff --git a/ACE/tests/Logging_Strategy_Test.cpp b/ACE/tests/Logging_Strategy_Test.cpp index 55b7f1b8c97..42aa3561046 100644 --- a/ACE/tests/Logging_Strategy_Test.cpp +++ b/ACE/tests/Logging_Strategy_Test.cpp @@ -200,10 +200,9 @@ static time_t get_statistics (ACE_TCHAR *f_name) { ACE_stat buf; - int result; - + // Get data associated with "file_name": - result = ACE_OS::stat (f_name, &buf); + int result = ACE_OS::stat (f_name, &buf); // Check if statistics are valid: if (result != 0) @@ -300,19 +299,17 @@ remove_files (void) ACE_TEXT ("-> removing existent files...\n"))); int error = 0; - int test; int i = 0; - ACE_TCHAR backup[MAXPATHLEN+1]; do { - i++; + ++i; + ACE_TCHAR backup[MAXPATHLEN+1]; ACE_OS::sprintf (backup, ACE_TEXT ("%s.%d"), file_name, i); - test = ACE_OS::unlink (backup); - if (test != 0) + if (ACE_OS::unlink (backup) != 0) error = 1; } while (error != 1); @@ -416,7 +413,9 @@ int run_main (int argc, ACE_TCHAR *argv []) { l_argv[0] = (ACE_TCHAR *)ACE_TEXT ("Logging_Strategy_Test"); l_argv[1] = - (ACE_TCHAR *) ACE_TEXT ("-slog/Logging_Strategy_Test") + (ACE_TCHAR *) ACE_TEXT ("-s") + ACE_DEFAULT_TEST_DIR + ACE_TEXT ("log/Logging_Strategy_Test") ACE_LOG_FILE_EXT_NAME; l_argv[2] = (ACE_TCHAR *) ACE_TEXT ("-o"); l_argv[3] = 0; diff --git a/ACE/tests/Service_Config_Test.cpp b/ACE/tests/Service_Config_Test.cpp index 654f7f49ca9..b359e1ee06d 100644 --- a/ACE/tests/Service_Config_Test.cpp +++ b/ACE/tests/Service_Config_Test.cpp @@ -66,10 +66,9 @@ private: u_short Test_Singleton::current_ = 0; extern "C" void -test_singleton_cleanup (void *object, void *param) +test_singleton_cleanup (void *object, void *) { // We can't reliably use ACE_Log_Msg in a cleanup hook. Yet. - ACE_UNUSED_ARG (param); /* ACE_DEBUG ((LM_DEBUG, "cleanup %d\n", (u_short) param)); */ delete (Test_Singleton *) object; |