results.webkit.org: Add os version to various unix ports
https://bugs.webkit.org/show_bug.cgi?id=202955
Rubber-stamped by Aakash Jain.
* Scripts/webkitpy/common/system/platforminfo.py:
(PlatformInfo.__init__): Use platform.release() to defined the os_version.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@251150 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 348fede..3288c63 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2019-10-15 Jonathan Bedard <jbedard@apple.com>
+
+ results.webkit.org: Add os version to various unix ports
+ https://bugs.webkit.org/show_bug.cgi?id=202955
+
+ Rubber-stamped by Aakash Jain.
+
+ * Scripts/webkitpy/common/system/platforminfo.py:
+ (PlatformInfo.__init__): Use platform.release() to defined the os_version.
+
2019-10-15 Wenson Hsieh <wenson_hsieh@apple.com>
REGRESSION: editing/async-clipboard/clipboard-interfaces.html is failing in WebKit1
diff --git a/Tools/Scripts/webkitpy/common/system/platforminfo.py b/Tools/Scripts/webkitpy/common/system/platforminfo.py
index 6ee1977..4453ef2 100644
--- a/Tools/Scripts/webkitpy/common/system/platforminfo.py
+++ b/Tools/Scripts/webkitpy/common/system/platforminfo.py
@@ -27,6 +27,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+import logging
import re
import sys
@@ -35,6 +36,9 @@
from webkitpy.common.system.executive import Executive
+_log = logging.getLogger(__name__)
+
+
class PlatformInfo(object):
MAX = 2147483647
@@ -62,11 +66,13 @@
self.os_version = Version.from_string(platform_module.mac_ver()[0])
elif self.os_name.startswith('win'):
self.os_version = self._win_version()
- elif self.os_name == 'linux' or self.os_name == 'freebsd' or self.os_name == 'openbsd' or self.os_name == 'netbsd':
- return
else:
# Most other platforms (namely iOS) return conforming version strings.
- self.os_version = Version.from_string(platform_module.release())
+ version = re.search(r'\d+.\d+.\d+', platform_module.release())
+ if version:
+ self.os_version = Version.from_string(version.group(0))
+ else:
+ _log.debug('No OS version number found')
def is_mac(self):
return self.os_name == 'mac'
