185 else |
185 else |
186 { |
186 { |
187 INFO_PRINTF1(_L(" Testing GroupId filtering enabled/ disabled ")); |
187 INFO_PRINTF1(_L(" Testing GroupId filtering enabled/ disabled ")); |
188 |
188 |
189 //reset config file |
189 //reset config file |
190 configIni.Clear(logger); |
190 configIni.ClearL(logger); |
191 |
191 |
192 |
192 |
193 /***********************************************************/ |
193 /***********************************************************/ |
194 /***enable GroupId, enable GroupId filtering*/ |
194 /***enable GroupId, enable GroupId filtering*/ |
195 /***********************************************************/ |
195 /***********************************************************/ |
196 |
196 |
197 INFO_PRINTF1(_L("\n\n Enable test GroupId, enable GroupId filtering.\n Testing error returns and ensuring a trace statement IS carried out ")); |
197 INFO_PRINTF1(_L("\n\n Enable test GroupId, enable GroupId filtering.\n Testing error returns and ensuring a trace statement IS carried out ")); |
198 SetBlockResult(TestGroupIdFiltering(logger, ETrue, ETrue)); |
198 SetBlockResult(TestGroupIdFilteringL(logger, ETrue, ETrue)); |
199 |
199 |
200 /***********************************************************/ |
200 /***********************************************************/ |
201 /***enable GroupId, disable GroupId filtering*/ |
201 /***enable GroupId, disable GroupId filtering*/ |
202 /***********************************************************/ |
202 /***********************************************************/ |
203 |
203 |
204 if(BlockResult()==EPass) |
204 if(BlockResult()==EPass) |
205 { |
205 { |
206 INFO_PRINTF1(_L("\n\n Enable test GroupId, disable GroupId filtering.\n Testing error returns and ensuring a trace statement IS carried out + lots of kernel traces ")); |
206 INFO_PRINTF1(_L("\n\n Enable test GroupId, disable GroupId filtering.\n Testing error returns and ensuring a trace statement IS carried out + lots of kernel traces ")); |
207 SetBlockResult(TestGroupIdFiltering(logger, ETrue, EFalse)); |
207 SetBlockResult(TestGroupIdFilteringL(logger, ETrue, EFalse)); |
208 } |
208 } |
209 |
209 |
210 /***********************************************************/ |
210 /***********************************************************/ |
211 /***disable GroupId, disable GroupId filtering*/ |
211 /***disable GroupId, disable GroupId filtering*/ |
212 /***********************************************************/ |
212 /***********************************************************/ |
213 |
213 |
214 if(BlockResult()==EPass) |
214 if(BlockResult()==EPass) |
215 { |
215 { |
216 INFO_PRINTF1(_L("\n\n Disable test GroupId, disable GroupId filtering.\n Testing error returns and ensuring a trace statement IS carried out + lots of kernel traces")); |
216 INFO_PRINTF1(_L("\n\n Disable test GroupId, disable GroupId filtering.\n Testing error returns and ensuring a trace statement IS carried out + lots of kernel traces")); |
217 SetBlockResult(TestGroupIdFiltering(logger, EFalse, EFalse)); |
217 SetBlockResult(TestGroupIdFilteringL(logger, EFalse, EFalse)); |
218 } |
218 } |
219 |
219 |
220 /***********************************************************/ |
220 /***********************************************************/ |
221 /***disable GroupId, enable GroupId filtering*/ |
221 /***disable GroupId, enable GroupId filtering*/ |
222 /***********************************************************/ |
222 /***********************************************************/ |
223 |
223 |
224 if(BlockResult()==EPass) |
224 if(BlockResult()==EPass) |
225 { |
225 { |
226 INFO_PRINTF1(_L("\n\n Disable test GroupId, enable GroupId filtering.\n Testing error returns and ensuring a trace statement IS NOT carried out ")); |
226 INFO_PRINTF1(_L("\n\n Disable test GroupId, enable GroupId filtering.\n Testing error returns and ensuring a trace statement IS NOT carried out ")); |
227 SetBlockResult(TestGroupIdFiltering(logger, EFalse, ETrue)); |
227 SetBlockResult(TestGroupIdFilteringL(logger, EFalse, ETrue)); |
228 } |
228 } |
229 |
229 |
230 } |
230 } |
231 |
231 |
232 if (BlockResult()==EPass&&OstStatus) |
232 if (BlockResult()==EPass&&OstStatus) |
495 break; |
495 break; |
496 } |
496 } |
497 } |
497 } |
498 } |
498 } |
499 CClearConfig configIni; |
499 CClearConfig configIni; |
500 configIni.Clear(logger); |
500 configIni.ClearL(logger); |
501 result = logger.SetSecondaryFiltersEnabled(setfilterarray,ETrue);//CA previously:Result = logger.EnableModuleUid(setfilter); |
501 result = logger.SetSecondaryFiltersEnabled(setfilterarray,ETrue);//CA previously:Result = logger.EnableModuleUid(setfilter); |
502 INFO_PRINTF2(_L("Setting single Secondary filter with filter rather than array has been set with single filter, %d, check log"), setfilter); |
502 INFO_PRINTF2(_L("Setting single Secondary filter with filter rather than array has been set with single filter, %d, check log"), setfilter); |
503 INFO_PRINTF2(_L("code: %d"), result); |
503 INFO_PRINTF2(_L("code: %d"), result); |
504 |
504 |
505 |
505 |
556 else |
556 else |
557 { |
557 { |
558 INFO_PRINTF1(_L(" Testing ComponentId filtering enabled/ disabled ")); |
558 INFO_PRINTF1(_L(" Testing ComponentId filtering enabled/ disabled ")); |
559 |
559 |
560 //reset config file |
560 //reset config file |
561 configIni.Clear(logger); |
561 configIni.ClearL(logger); |
562 |
562 |
563 |
563 |
564 /***********************************************************/ |
564 /***********************************************************/ |
565 /***enable ComponentID, enable ComponentID filtering*/ |
565 /***enable ComponentID, enable ComponentID filtering*/ |
566 /***********************************************************/ |
566 /***********************************************************/ |
567 |
567 |
568 INFO_PRINTF1(_L("\n\n Enable test ComponentID, enable ComponentID filtering.\n Testing error returns and ensuring a trace statement IS carried out ")); |
568 INFO_PRINTF1(_L("\n\n Enable test ComponentID, enable ComponentID filtering.\n Testing error returns and ensuring a trace statement IS carried out ")); |
569 SetBlockResult(TestComponentIdFiltering(logger, ETrue, ETrue)); |
569 SetBlockResult(TestComponentIdFilteringL(logger, ETrue, ETrue)); |
570 |
570 |
571 /***********************************************************/ |
571 /***********************************************************/ |
572 /***enable ComponentId, disable ComponentId filtering*/ |
572 /***enable ComponentId, disable ComponentId filtering*/ |
573 /***********************************************************/ |
573 /***********************************************************/ |
574 |
574 |
575 if(BlockResult()==EPass) |
575 if(BlockResult()==EPass) |
576 { |
576 { |
577 INFO_PRINTF1(_L("\n\n Enable test ComponentId, disable ComponentId filtering.\n Testing error returns and ensuring a trace statement IS carried out ")); |
577 INFO_PRINTF1(_L("\n\n Enable test ComponentId, disable ComponentId filtering.\n Testing error returns and ensuring a trace statement IS carried out ")); |
578 SetBlockResult(TestComponentIdFiltering(logger, ETrue, EFalse)); |
578 SetBlockResult(TestComponentIdFilteringL(logger, ETrue, EFalse)); |
579 } |
579 } |
580 |
580 |
581 /***********************************************************/ |
581 /***********************************************************/ |
582 /***disable ComponentId, disable ComponentId filtering*/ |
582 /***disable ComponentId, disable ComponentId filtering*/ |
583 /***********************************************************/ |
583 /***********************************************************/ |
584 |
584 |
585 if(BlockResult()==EPass) |
585 if(BlockResult()==EPass) |
586 { |
586 { |
587 INFO_PRINTF1(_L("\n\n Disable test ComponentId, disable ComponentId filtering.\n Testing error returns and ensuring a trace statement IS carried out ")); |
587 INFO_PRINTF1(_L("\n\n Disable test ComponentId, disable ComponentId filtering.\n Testing error returns and ensuring a trace statement IS carried out ")); |
588 SetBlockResult(TestComponentIdFiltering(logger, EFalse, EFalse)); |
588 SetBlockResult(TestComponentIdFilteringL(logger, EFalse, EFalse)); |
589 } |
589 } |
590 |
590 |
591 /***********************************************************/ |
591 /***********************************************************/ |
592 /***disable ComponentId, enable ComponentId filtering*/ |
592 /***disable ComponentId, enable ComponentId filtering*/ |
593 /***********************************************************/ |
593 /***********************************************************/ |
594 |
594 |
595 if(BlockResult()==EPass) |
595 if(BlockResult()==EPass) |
596 { |
596 { |
597 INFO_PRINTF1(_L("\n\n Disable test ComponentId, enable ComponentId filtering.\n Testing error returns and ensuring a trace statement IS NOT carried out ")); |
597 INFO_PRINTF1(_L("\n\n Disable test ComponentId, enable ComponentId filtering.\n Testing error returns and ensuring a trace statement IS NOT carried out ")); |
598 SetBlockResult(TestComponentIdFiltering(logger, EFalse, ETrue)); |
598 SetBlockResult(TestComponentIdFilteringL(logger, EFalse, ETrue)); |
599 } |
599 } |
600 } |
600 } |
601 |
601 |
602 if (BlockResult()==EPass&&OstStatus) |
602 if (BlockResult()==EPass&&OstStatus) |
603 { |
603 { |