Browse Source

Fixes ever more issues

msmith-techempower 8 years ago
parent
commit
c25d1aba09
2 changed files with 9 additions and 3 deletions
  1. 2 1
      toolset/benchmark/benchmarker.py
  2. 7 2
      toolset/benchmark/framework_test.py

+ 2 - 1
toolset/benchmark/benchmarker.py

@@ -694,7 +694,8 @@ class Benchmarker:
   ############################################################
   ############################################################
   def __stop_test(self, ppid, out):
   def __stop_test(self, ppid, out):
     try:
     try:
-      subprocess.check_call('pkill -P %s' % ppid, shell=True, stderr=out, stdout=out)
+      subprocess.check_call(['pkill', '-9', '-P', str(ppid)], stderr=out, stdout=out)
+      subprocess.check_call(['kill', '-9', str(ppid)], stderr=out, stdout=out)
       retcode = 0
       retcode = 0
     except Exception:
     except Exception:
       retcode = 1
       retcode = 1

+ 7 - 2
toolset/benchmark/framework_test.py

@@ -190,8 +190,13 @@ class FrameworkTest:
     # Always ensure that IROOT exists
     # Always ensure that IROOT exists
     if not os.path.exists(self.install_root):
     if not os.path.exists(self.install_root):
       os.mkdir(self.install_root)
       os.mkdir(self.install_root)
-      subprocess.check_call(['gcc', '-std=c99', '-oTFBReaper', 
-        os.path.join(self.fwroot,'toolset/setup/linux/TFBReaper.c')])
+
+    if not os.path.exists(os.path.join(self.install_root,"TFBReaper")):
+      subprocess.check_call(['gcc', 
+        '-std=c99', 
+        '-o%s/TFBReaper' % self.install_root, 
+        os.path.join(self.fwroot,'toolset/setup/linux/TFBReaper.c')  ],
+        stderr=out, stdout=out)
 
 
     # Run the module start inside parent of TROOT
     # Run the module start inside parent of TROOT
     #  - we use the parent as a historical accident, a number of tests
     #  - we use the parent as a historical accident, a number of tests