Преглед на файлове

BUG: Fix reporting of path and full command when test program was not found

Andy Cedilnik преди 21 години
родител
ревизия
0cbf55745a
променени са 1 файла, в които са добавени 3 реда и са изтрити 1 реда
  1. 3 1
      Source/CTest/cmCTestTestHandler.cxx

+ 3 - 1
Source/CTest/cmCTestTestHandler.cxx

@@ -407,6 +407,7 @@ void cmCTestTestHandler::ProcessDirectory(std::vector<cmStdString> &passed,
       cmSystemTools::ChangeDirectory(it->m_Directory.c_str());
       cmSystemTools::ChangeDirectory(it->m_Directory.c_str());
       }
       }
     cres.m_Name = testname;
     cres.m_Name = testname;
+    cres.m_Path = it->m_Directory.c_str();
     if(m_TestsToRun.size() && 
     if(m_TestsToRun.size() && 
        std::find(m_TestsToRun.begin(), m_TestsToRun.end(), cnt) == m_TestsToRun.end())
        std::find(m_TestsToRun.begin(), m_TestsToRun.end(), cnt) == m_TestsToRun.end())
       {
       {
@@ -448,6 +449,7 @@ void cmCTestTestHandler::ProcessDirectory(std::vector<cmStdString> &passed,
         args[1].Value.c_str() << "\n";
         args[1].Value.c_str() << "\n";
       if ( !m_CTest->GetShowOnly() )
       if ( !m_CTest->GetShowOnly() )
         {
         {
+        cres.m_FullCommandLine = actualCommand;
         m_TestResults.push_back( cres ); 
         m_TestResults.push_back( cres ); 
         failed.push_back(testname);
         failed.push_back(testname);
         continue;
         continue;
@@ -611,9 +613,9 @@ void cmCTestTestHandler::ProcessDirectory(std::vector<cmStdString> &passed,
           }
           }
         }
         }
       }
       }
+
     cres.m_Output = output;
     cres.m_Output = output;
     cres.m_ReturnValue = retVal;
     cres.m_ReturnValue = retVal;
-    cres.m_Path = it->m_Directory.c_str();
     cres.m_CompletionStatus = "Completed";
     cres.m_CompletionStatus = "Completed";
     m_TestResults.push_back( cres );
     m_TestResults.push_back( cres );
     }
     }