Take 2 at fixing merge errors with crashdump hooks
Signed-off-by: Martin J. Bligh <mbligh@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@885 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/server/server_job.py b/server/server_job.py
index 665c4ec..ad4d23d 100755
--- a/server/server_job.py
+++ b/server/server_job.py
@@ -11,7 +11,7 @@
Andy Whitcroft <apw@shadowen.org>
"""
-import os, sys, re
+import os, sys, re, time
import test
from utils import *
from error import *
@@ -139,6 +139,7 @@
namespace['machines'] = machines
namespace['args'] = self.args
namespace['job'] = self
+ test_start_time = int(time.time())
os.chdir(self.resultdir)
@@ -158,6 +159,10 @@
exec(preamble + server_control, namespace, namespace)
finally:
+ if machines:
+ namespace['test_start_time'] = test_start_time
+ exec(preamble + crashdumps, namespace,
+ namespace)
if reboot and machines:
exec(preamble + cleanup, namespace, namespace)
if install_after and machines: