aboutsummaryrefslogtreecommitdiff
path: root/backends.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2015-07-22 23:57:00 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2015-07-23 22:28:03 +0300
commitfa74ef4c5785453ebdd1aaa1380aa7a632336c5b (patch)
tree6494ce9b4db6ff92ea3a4e3553727d58cfa6e970 /backends.py
parent5148972bfe5f4d2012ec29cf913ec8cf5eafd47e (diff)
downloadmeson-fa74ef4c5785453ebdd1aaa1380aa7a632336c5b.zip
meson-fa74ef4c5785453ebdd1aaa1380aa7a632336c5b.tar.gz
meson-fa74ef4c5785453ebdd1aaa1380aa7a632336c5b.tar.bz2
Added timeout kwarg to tests.
Diffstat (limited to 'backends.py')
-rw-r--r--backends.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/backends.py b/backends.py
index 851ed51..1fe98b5 100644
--- a/backends.py
+++ b/backends.py
@@ -20,7 +20,7 @@ from coredata import MesonException
class TestSerialisation:
def __init__(self, name, fname, is_cross, exe_wrapper, is_parallel, cmd_args, env,
- should_fail, valgrind_args):
+ should_fail, valgrind_args, timeout):
self.name = name
self.fname = fname
self.is_cross = is_cross
@@ -30,6 +30,7 @@ class TestSerialisation:
self.env = env
self.should_fail = should_fail
self.valgrind_args = valgrind_args
+ self.timeout = timeout
# This class contains the basic functionality that is needed by all backends.
# Feel free to move stuff in and out of it as you see fit.
@@ -251,7 +252,8 @@ class Backend():
else:
exe_wrapper = None
ts = TestSerialisation(t.get_name(), fname, is_cross, exe_wrapper,
- t.is_parallel, t.cmd_args, t.env, t.should_fail, t.valgrind_args)
+ t.is_parallel, t.cmd_args, t.env, t.should_fail, t.valgrind_args,
+ t.timeout)
arr.append(ts)
pickle.dump(arr, datafile)