Title: [279067] trunk/Tools
Revision
279067
Author
jbed...@apple.com
Date
2021-06-21 08:51:06 -0700 (Mon, 21 Jun 2021)

Log Message

[resultsdbpy] Adopt autoinstaller (Follow-up fix)
https://bugs.webkit.org/show_bug.cgi?id=227096
<rdar://problem/79418080>

Rubber-stamped by Aakash Jain.

* Scripts/libraries/resultsdbpy/container: Fix libraries path.
* Scripts/libraries/resultsdbpy/run: Ditto.
* Scripts/libraries/resultsdbpy/run-tests: Ditto.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (279066 => 279067)


--- trunk/Tools/ChangeLog	2021-06-21 15:08:43 UTC (rev 279066)
+++ trunk/Tools/ChangeLog	2021-06-21 15:51:06 UTC (rev 279067)
@@ -1,3 +1,15 @@
+2021-06-21  Jonathan Bedard  <jbed...@apple.com>
+
+        [resultsdbpy] Adopt autoinstaller (Follow-up fix)
+        https://bugs.webkit.org/show_bug.cgi?id=227096
+        <rdar://problem/79418080>
+
+        Rubber-stamped by Aakash Jain.
+
+        * Scripts/libraries/resultsdbpy/container: Fix libraries path.
+        * Scripts/libraries/resultsdbpy/run: Ditto.
+        * Scripts/libraries/resultsdbpy/run-tests: Ditto.
+
 2021-06-19  Commit Queue  <commit-qu...@webkit.org>
 
         Unreviewed, reverting r278699.

Modified: trunk/Tools/Scripts/libraries/resultsdbpy/container (279066 => 279067)


--- trunk/Tools/Scripts/libraries/resultsdbpy/container	2021-06-21 15:08:43 UTC (rev 279066)
+++ trunk/Tools/Scripts/libraries/resultsdbpy/container	2021-06-21 15:51:06 UTC (rev 279067)
@@ -29,7 +29,7 @@
 import resultsdbpy
 from webkitcorepy import AutoInstall
 
-libraries = os.path.join(os.path.abspath(os.path.dirname(os.path.dirname(os.path.dirname(__file__)))), 'libraries')
+libraries = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 if sys.platform == 'darwin':
     is_root = not os.getuid()
     does_own_libraries = os.stat(libraries).st_uid == os.getuid()

Modified: trunk/Tools/Scripts/libraries/resultsdbpy/run (279066 => 279067)


--- trunk/Tools/Scripts/libraries/resultsdbpy/run	2021-06-21 15:08:43 UTC (rev 279066)
+++ trunk/Tools/Scripts/libraries/resultsdbpy/run	2021-06-21 15:51:06 UTC (rev 279067)
@@ -32,7 +32,7 @@
 import resultsdbpy
 from webkitcorepy import AutoInstall
 
-libraries = os.path.join(os.path.abspath(os.path.dirname(os.path.dirname(os.path.dirname(__file__)))), 'libraries')
+libraries = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 if sys.platform == 'darwin':
     is_root = not os.getuid()
     does_own_libraries = os.stat(libraries).st_uid == os.getuid()

Modified: trunk/Tools/Scripts/libraries/resultsdbpy/run-tests (279066 => 279067)


--- trunk/Tools/Scripts/libraries/resultsdbpy/run-tests	2021-06-21 15:08:43 UTC (rev 279066)
+++ trunk/Tools/Scripts/libraries/resultsdbpy/run-tests	2021-06-21 15:51:06 UTC (rev 279067)
@@ -33,7 +33,7 @@
 import resultsdbpy
 from webkitcorepy import AutoInstall
 
-libraries = os.path.join(os.path.abspath(os.path.dirname(os.path.dirname(os.path.dirname(__file__)))), 'libraries')
+libraries = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 if sys.platform == 'darwin':
     is_root = not os.getuid()
     does_own_libraries = os.stat(libraries).st_uid == os.getuid()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to