Browse Source

removed sudo and added checking for installs dir in framework_test

Nate Brady 9 years ago
parent
commit
40b483f39f
2 changed files with 3 additions and 1 deletions
  1. 1 1
      toolset/benchmark/benchmarker.py
  2. 2 0
      toolset/benchmark/framework_test.py

+ 1 - 1
toolset/benchmark/benchmarker.py

@@ -970,7 +970,7 @@ class Benchmarker:
   
     # remove installs directories if --clean-all provided
     if args['clean_all']:
-        os.system("sudo rm -rf " + os.path.join(self.fwroot, "installs"))
+        os.system("rm -rf " + os.path.join(self.fwroot, "installs"))
         os.mkdir("installs")
 
     if hasattr(self, 'parse') and self.parse != None:

+ 2 - 0
toolset/benchmark/framework_test.py

@@ -188,6 +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")
     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')