Преглед на файлове

Maybe killing process groups now

msmith-techempower преди 8 години
родител
ревизия
fb4a268a35
променени са 2 файла, в които са добавени 2 реда и са изтрити 3 реда
  1. 1 1
      toolset/benchmark/benchmarker.py
  2. 1 2
      toolset/benchmark/framework_test.py

+ 1 - 1
toolset/benchmark/benchmarker.py

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

+ 1 - 2
toolset/benchmark/framework_test.py

@@ -239,13 +239,12 @@ class FrameworkTest:
 
     # Start the setup.sh command
     p = subprocess.Popen(command,
+          shell=True,
           cwd=self.directory,
           stdout=subprocess.PIPE,
           stderr=subprocess.STDOUT,
           preexec_fn=os.setsid)
-    logging.info("PID: %s" % p.pid)
     sid = os.getsid(p.pid)
-    logging.info("SID: %s" % os.getsid(p.pid))
     nbsr = setup_util.NonBlockingStreamReader(p.stdout,
       "%s: %s.sh and framework processes have terminated" % (self.name, self.setup_file))