Changeset 277317 in webkit

Timestamp:

May 10, 2021, 9:46:49 PM (5 years ago)

Author:

Chris Dumez

Message:

Use non-throwing std::filesystem API in TestRunner
​https://bugs.webkit.org/show_bug.cgi?id=225632

Reviewed by Darin Adler.

• TestRunnerShared/TestCommand.cpp:

(WTR::testPath):
(WTR::testURLString):

• TestRunnerShared/TestFeatures.cpp:

(WTR::parseTestHeader):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestRunnerShared/TestCommand.cpp (modified) (2 diffs)
• TestRunnerShared/TestFeatures.cpp (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-05-10  Chris Dumez  <cdumez@apple.com>
+
+        Use non-throwing std::filesystem API in TestRunner
+        https://bugs.webkit.org/show_bug.cgi?id=225632
+
+        Reviewed by Darin Adler.
+
+        * TestRunnerShared/TestCommand.cpp:
+        (WTR::testPath):
+        (WTR::testURLString):
+        * TestRunnerShared/TestFeatures.cpp:
+        (WTR::parseTestHeader):
+
 2021-05-10  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Tools/TestRunnerShared/TestCommand.cpp

@@ -121 +121 @@
         return pathOrURL.substr(strlen("file:/"));
 
-    return std::filesystem::absolute(pathOrURL);
+    std::error_code ec;
+    return std::filesystem::absolute(pathOrURL, ec);
 }
 
@@ -129 +130 @@
         return pathOrURL;
 
-    return "file://" + std::filesystem::absolute(pathOrURL).generic_string();
+    std::error_code ec;
+    return "file://" + std::filesystem::absolute(pathOrURL, ec).generic_string();
 }
 

trunk/Tools/TestRunnerShared/TestFeatures.cpp

@@ -247 +247 @@
 {
     TestFeatures features;
-    if (!std::filesystem::exists(path))
+    std::error_code ec;
+    if (!std::filesystem::exists(path, ec))
         return features;