Mercurial > hg > graal-jvmci-8

changeset 22716:f536aaa5a5d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use mx.ensure_dir_exists rather than os.makedirs to avoid races
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Fri, 30 Oct 2015 12:28:17 +0100
parents 3c0753fbb592
children ba7846fcb814
files mx.jvmci/mx_jvmci.py
diffstat 1 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mx.jvmci/mx_jvmci.py	Mon Nov 02 11:24:40 2015 +0100
+++ b/mx.jvmci/mx_jvmci.py	Fri Oct 30 12:28:17 2015 +0100
@@ -606,8 +606,7 @@
 
 def copyToJdk(src, dst, permissions=JDK_UNIX_PERMISSIONS_FILE):
     name = os.path.basename(src)
-    if not exists(dst):
-        os.makedirs(dst)
+    mx.ensure_dir_exists(dst)
     dstLib = join(dst, name)
     if mx.get_env('SYMLINK_GRAAL_JAR', None) == 'true':
         # Using symlinks is much faster than copying but may
@@ -627,7 +626,7 @@
 
 def _extractJVMCIFiles(jdkJars, jvmciJars, servicesDir, obsoleteCheck):
 
-    oldServices = os.listdir(servicesDir) if exists(servicesDir) else os.makedirs(servicesDir)
+    oldServices = os.listdir(servicesDir) if exists(servicesDir) else mx.ensure_dir_exists(servicesDir)
 
     jvmciServices = {}
     for jar in jvmciJars:
@@ -1489,8 +1488,7 @@
     benchmarks = [b for b in benchmarksAndJsons if not b.startswith('{')]
     jmhArgJsons = [b for b in benchmarksAndJsons if b.startswith('{')]
     jmhOutDir = join(_suite.mxDir, 'jmh')
-    if not exists(jmhOutDir):
-        os.makedirs(jmhOutDir)
+    mx.ensure_dir_exists(jmhOutDir)
     jmhOut = join(jmhOutDir, 'jmh.out')
     jmhArgs = {'-rff' : jmhOut, '-v' : 'EXTRA' if mx._opts.verbose else 'NORMAL'}