Browse Source

use self.install_root instead of 'installs'

Nate Brady 9 years ago
parent
commit
6007248576
2 changed files with 5 additions and 4 deletions
  1. 3 2
      toolset/benchmark/benchmarker.py
  2. 2 2
      toolset/benchmark/framework_test.py

+ 3 - 2
toolset/benchmark/benchmarker.py

@@ -969,9 +969,10 @@ class Benchmarker:
     self.latest_results_directory = self.latest_results_directory()
   
     # remove installs directories if --clean-all provided
+    self.install_root = "%s/%s" % (self.fwroot, "installs")
     if args['clean_all']:
-        os.system("rm -rf " + os.path.join(self.fwroot, "installs"))
-        os.mkdir("installs")
+        os.system("rm -rf " + self.install_root)
+        os.mkdir(self.install_root)
 
     if hasattr(self, 'parse') and self.parse != None:
       self.timestamp = self.parse

+ 2 - 2
toolset/benchmark/framework_test.py

@@ -188,8 +188,8 @@ class FrameworkTest:
                 max(self.benchmarker.concurrency_levels)))
 
     # Always ensure that IROOT belongs to the runner_user
-    if not os.path.exists("installs"):
-      os.mkdir("installs")
+    if not os.path.exists(self.install_root):
+      os.mkdir(self.install_root)
     chown = "sudo chown -R %s:%s %s" % (self.benchmarker.runner_user,
       self.benchmarker.runner_user, os.path.join(self.fwroot, self.install_root))
     subprocess.check_call(chown, shell=True, cwd=self.fwroot, executable='/bin/bash')