summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2017-08-11 15:45:34 +0200
committerJohnny Willemsen <jwillemsen@remedy.nl>2017-08-11 15:45:34 +0200
commit9da4c05d015992aec1665db2b60f1597707823e7 (patch)
treeed8dba072c9c9ac7b7a97ea159a41e16854802ce
parent646c2eb84251f97113eef664707fe2732101dead (diff)
downloadATCD-9da4c05d015992aec1665db2b60f1597707823e7.tar.gz
Extended the test to make sure %D and %#D also don't have a leading space
* ACE/tests/Log_Msg_Test.cpp:
-rw-r--r--ACE/tests/Log_Msg_Test.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/ACE/tests/Log_Msg_Test.cpp b/ACE/tests/Log_Msg_Test.cpp
index cfeb09504f2..0b489116694 100644
--- a/ACE/tests/Log_Msg_Test.cpp
+++ b/ACE/tests/Log_Msg_Test.cpp
@@ -712,9 +712,9 @@ Log_Spec_Verify::result (void)
ACE_ERROR ((LM_ERROR, ACE_TEXT ("%d logging specifier tests failed!\n"),
this->fail_));
- if (this->tests_ != 17)
+ if (this->tests_ != 19)
{
- ACE_ERROR ((LM_ERROR, ACE_TEXT ("Expected number of tests run is %d, not 17!\n"),
+ ACE_ERROR ((LM_ERROR, ACE_TEXT ("Expected number of tests run is %d, not 19!\n"),
this->tests_));
++this->fail_;
}
@@ -745,10 +745,6 @@ test_format_specs (void)
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%m %p\n"), ACE_TEXT("perror")));
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%S\n"), SIGINT));
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%S\n"), ACE_NSIG));
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%D\n")));
- ACE_Time_Value tv = ACE_OS::gettimeofday ();
- tv += ACE_Time_Value (25*60*60); // + 25 hours
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%#D\n"), &tv));
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("thread id %t\n")));
Log_Spec_Verify verifier;
@@ -794,6 +790,11 @@ test_format_specs (void)
ACE_DEBUG ((LM_ALERT, ACE_TEXT ("l5:%.1M")));
ACE_DEBUG ((LM_EMERGENCY, ACE_TEXT ("l5:%.1M")));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("l6:%D\n")));
+ ACE_Time_Value tv = ACE_OS::gettimeofday ();
+ tv += ACE_Time_Value (25*60*60); // + 25 hours
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("l6:%#D\n"), &tv));
+
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("l6:%T\n")));
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("l6:%#T\n"), &tv));