View | Details | Raw Unified | Return to bug 1493
Collapse All | Expand All

(-)a/src/core/model/test.cc (-2 / +15 lines)
 Lines 570-579    Link Here 
570 
TestRunnerImpl::PrintTestNameList (std::list<TestCase *>::const_iterator begin,
570 
TestRunnerImpl::PrintTestNameList (std::list<TestCase *>::const_iterator begin,
571 
                                   std::list<TestCase *>::const_iterator end) const
 571 
                                   std::list<TestCase *>::const_iterator end) const
572 
{
 572 
{
573 
  std::vector<std::string> label(TestSuite::NUM_TYPES);
574 
  label[TestSuite::ALL]         = "all          ";
575 
  label[TestSuite::BVT]         = "bvt          ";
576 
  label[TestSuite::UNIT]        = "unit         ";
577 
  label[TestSuite::SYSTEM]      = "system       ";
578 
  label[TestSuite::EXAMPLE]     = "example      ";
579 
  label[TestSuite::PERFORMANCE] = "performance  ";
580 

            

        

          573
          
  for (std::list<TestCase *>::const_iterator i = begin; i != end; ++i)

          581
          
  for (std::list<TestCase *>::const_iterator i = begin; i != end; ++i)

        

        

          574
          
    {

          582
          
    {

        

          
            

              575
              
      TestCase *test = *i;


              583
              
      TestSuite * test= dynamic_cast<TestSuite *>(*i);

            

            

              576
              
      std::cout << test->GetName () << std::endl;


              584
              
      std::cout << label[test->GetTestType ()]

            

            

              
              

              585
              
                << test->GetName () << std::endl;

            

        

          577
          
    }

          586
          
    }

        

        

          578
          
}

          587
          
}

        

        

          579
          

          588
          

        

  

    

    

       Lines 726-731
       
    
  Link Here 
    

  

        

          726
          
    {

          735
          
    {

        

        

          727
          
      testType = TestSuite::SYSTEM;

          736
          
      testType = TestSuite::SYSTEM;

        

        

          728
          
    }

          737
          
    }

        

            

              
              
              738
              
  else if (testTypeString == "performance")

            

            

              739
              
    {

            

            

              740
              
      testType = TestSuite::PERFORMANCE;

            

            

              741
              
    }

            

        

          729
          
  else

          742
          
  else

        

        

          730
          
    {

          743
          
    {

        

        

          731
          
      std::cout << "Invalid test type specified: " << testTypeString << std::endl;

          744
          
      std::cout << "Invalid test type specified: " << testTypeString << std::endl;

        



(-)a/test.py
      (-2 / +10 lines)




  

    

    

       Lines 82-88
       
    
  Link Here 
    

  

        

          82
          
# If the user has constrained us to run certain kinds of tests, we can tell waf

          82
          
# If the user has constrained us to run certain kinds of tests, we can tell waf

        

        

          83
          
# to only build

          83
          
# to only build

        

        

          84
          
#

          84
          
#

        

          
            

              85
              
core_kinds = ["bvt", "core", "system", "unit"]


              85
              
core_kinds = ["bvt", "core", "system", "unit", "performance"]

            

        

          86
          

          86
          

        

        

          87
          
#

          87
          
#

        

        

          88
          
# There are some special cases for test suites that kill valgrind.  This is

          88
          
# There are some special cases for test suites that kill valgrind.  This is

        

  

    

    

       Lines 1114-1120
       
    
  Link Here 
    

  

        

          1114
          
        path_cmd = os.path.join("utils", test_runner_name + " --print-test-name-list")

          1114
          
        path_cmd = os.path.join("utils", test_runner_name + " --print-test-name-list")

        

        

          1115
          
        (rc, standard_out, standard_err, et) = run_job_synchronously(path_cmd, os.getcwd(), False, False)

          1115
          
        (rc, standard_out, standard_err, et) = run_job_synchronously(path_cmd, os.getcwd(), False, False)

        

        

          1116
          
        list_items = standard_out.split('\n')

          1116
          
        list_items = standard_out.split('\n')

        

          
            

              1117
              
        print "\n".join(sorted(list_items))


              1117
              
        # Sort tests based on lower case test name,

            

            

              
              

              1118
              
        # when the test type is listed first

            

            


              1119
              
        dict = {}

            

            


              1120
              
        for item in list_items:

            

            


              1121
              
           tokens = item.split()

            

            


              1122
              
           if len(tokens) == 2 :

            

            


              1123
              
               dict[tokens[1].lower()] = item

            

            


              1124
              
        for key in sorted(dict.iterkeys()):

            

            


              1125
              
            print dict[key]

            

        

          1118
          

          1126
          

        

        

          1119
          
    if options.kinds or options.list:

          1127
          
    if options.kinds or options.list:

        

        

          1120
          
        return

          1128
          
        return

        






  

  Return to bug 1493