[ros-diffs] [tfaber] 53365: [KMTESTS] - Mark ExTimer test as hidden - Mark some more tests as interactive in ExHardError - Now an automated test run on ROS runs smoothly, aside from assertions

[tfaber]

Author: tfaber
Date: Mon Aug 22 09:56:36 2011
New Revision: 53365

URL: http://svn.reactos.org/svn/reactos?rev=53365&view=rev
Log:
[KMTESTS]
- Mark ExTimer test as hidden
- Mark some more tests as interactive in ExHardError
- Now an automated test run on ROS runs smoothly, aside from assertions

Modified:
    branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c
    branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExHardError.c

Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c
URL: 
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c?rev=53365&r1=53364&r2=53365&view=diff
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c [iso-8859-1] 
(original)
+++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c [iso-8859-1] 
Mon Aug 22 09:56:36 2011
@@ -46,7 +46,7 @@
     { "ExResource",                         Test_ExResource },
     { "ExSequencedList",                    Test_ExSequencedList },
     { "ExSingleList",                       Test_ExSingleList },
-    { "ExTimer",                            Test_ExTimer },
+    { "-ExTimer",                           Test_ExTimer },
     { "Example",                            Test_Example },
     { "FsRtlExpression",                    Test_FsRtlExpression },
     { "IoDeviceInterface",                  Test_IoDeviceInterface },

Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExHardError.c
URL: 
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExHardError.c?rev=53365&r1=53364&r2=53365&view=diff
==============================================================================
--- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExHardError.c [iso-8859-1] 
(original)
+++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExHardError.c [iso-8859-1] 
Mon Aug 22 09:56:36 2011
@@ -91,14 +91,15 @@
     CheckHardError(0x40000000,                  0, OptionOk,                
STATUS_SUCCESS,            ResponseOk,             0, 0);                       
   // outputs a box :|
     CheckHardError(0x40000001,                  0, OptionOk,                
STATUS_SUCCESS,            ResponseOk,             4, 1, 2, 3, 4);              
   // outputs a box :|
     CheckHardError(0x40000002,                  0, OptionOk,                
STATUS_SUCCESS,            ResponseOk,             5, 1, 2, 3, 4, 5);           
   // outputs a box :|
-    }
-    CheckHardError(0x40000003,                  0, OptionOk,                
STATUS_SUCCESS,            ResponseNotHandled,     6, 1, 2, 3, 4, 5, 6);
+    CheckHardError(0x40000003,                  0, OptionOk,                
STATUS_SUCCESS,            ResponseNotHandled,     6, 1, 2, 3, 4, 5, 6);        
   // TODO: interactive on ROS
+    }
 
     CheckHardError(0x40000004,                  0, OptionShutdownSystem,    
STATUS_PRIVILEGE_NOT_HELD, ResponseNotHandled,     0, 0);
+    if (InteractivePart1)
+    {
+    // TODO: these 2 are interactive on ROS
     CheckHardError(0x40000005,                  0, OptionOkNoWait,          
STATUS_SUCCESS,            ResponseOk,             0, 0);                       
   // outputs a balloon notification
     CheckHardError(0x4000000f,                  0, OptionOkNoWait,          
STATUS_SUCCESS,            ResponseOk,             0, 0);                       
   // outputs a balloon notification
-    if (InteractivePart1)
-    {
     CheckHardError(0x40000006,                  0, OptionAbortRetryIgnore,  
STATUS_SUCCESS,            ResponseAbort,          0, 0);                       
   // outputs a box :|
     CheckHardError(0x40000006,                  0, OptionAbortRetryIgnore,  
STATUS_SUCCESS,            ResponseRetry,          0, 0);                       
   // outputs a box :|
     CheckHardError(0x40000006,                  0, OptionAbortRetryIgnore,  
STATUS_SUCCESS,            ResponseIgnore,         0, 0);                       
   // outputs a box :|
@@ -195,11 +196,12 @@
     CheckHardError(STATUS_FATAL_APP_EXIT,       0, OptionYesNoCancel,       
STATUS_SUCCESS,            ResponseCancel,         1, "Parameter1");            
   // outputs a box :|
     CheckHardError(STATUS_FATAL_APP_EXIT,       0, OptionYesNoCancel,       
STATUS_SUCCESS,            ResponseCancel,         1, 1234);                    
   // outputs a box :|
     CheckHardError(STATUS_FATAL_APP_EXIT,       0, OptionYesNoCancel,       
STATUS_SUCCESS,            ResponseCancel,         1, NULL);                    
   // outputs a box :|
-    }
-
+
+    // TODO: these 3 are interactive on ROS
     CheckInformationalHardError(STATUS_WAIT_0,               NULL,     NULL, 
STATUS_SUCCESS, TRUE);                                                          
  // outputs a balloon notification
     CheckInformationalHardError(STATUS_DLL_NOT_FOUND,        &String1, NULL, 
STATUS_SUCCESS, TRUE);                                                          
  // outputs a balloon notification
     CheckInformationalHardError(STATUS_DLL_NOT_FOUND,        NULL,     NULL, 
STATUS_SUCCESS, TRUE);                                                          
  // outputs a balloon notification
+    }
     CheckInformationalHardError(STATUS_SERVICE_NOTIFICATION, &String1, NULL, 
STATUS_SUCCESS, FALSE);
 
     ok_bool_true(IoSetThreadHardErrorMode(TRUE), "IoSetThreadHardErrorMode 
returned");