瀏覽代碼

CTest: Do not get CDash version without drop site (#12618)

Avoid sleep for 3 seconds in ctest if CDashDropSite is empty.
Valat Sébastien 14 年之前
父節點
當前提交
52f937aea8
共有 1 個文件被更改,包括 6 次插入2 次删除
  1. 6 2
      Source/cmCTest.cxx

+ 6 - 2
Source/cmCTest.cxx

@@ -440,8 +440,12 @@ std::string cmCTest::GetCDashVersion()
   std::string cdashUri = this->GetCTestConfiguration("DropLocation");
   std::string cdashUri = this->GetCTestConfiguration("DropLocation");
   cdashUri = cdashUri.substr(0, cdashUri.find("/submit.php"));
   cdashUri = cdashUri.substr(0, cdashUri.find("/submit.php"));
 
 
-  url += cdashUri + "/api/getversion.php";
-  int res = cmCTest::HTTPRequest(url, cmCTest::HTTP_GET, response, "", "", 3);
+  int res = 1;
+  if ( ! cdashUri.empty() )
+  {
+    url += cdashUri + "/api/getversion.php";
+    res = cmCTest::HTTPRequest(url, cmCTest::HTTP_GET, response, "", "", 3);
+  }
 
 
   return res ? this->GetCTestConfiguration("CDashVersion") : response;
   return res ? this->GetCTestConfiguration("CDashVersion") : response;
 #else
 #else