From db3780f93aa3a2c894701d7fef62a4f4e0745068 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Thu, 17 Nov 2011 11:55:03 +0100
Subject: [PATCH] Prevent runnning of confd tests in burnin
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
tools/burnin | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tools/burnin b/tools/burnin
index c5d1612ff..044270919 100755
--- a/tools/burnin
+++ b/tools/burnin
@@ -178,7 +178,7 @@ OPTIONS = [
const=[], default=[{}]),
cli.cli_option("--no-confd", dest="do_confd_tests",
help="Skip confd queries",
- action="store_false", default=True),
+ action="store_false", default=constants.ENABLE_CONFD),
cli.cli_option("--rename", dest="rename", default=None,
help=("Give one unused instance name which is taken"
" to start the renaming sequence"),
@@ -991,6 +991,9 @@ class Burner(object):
Err("When one node is available/selected the disk template must"
" be 'diskless', 'file' or 'plain'")
+ if opts.do_confd_tests and not constants.ENABLE_CONFD:
+ Err("You selected confd tests but confd was disabled at configure time")
+
has_err = True
try:
self.BurnCreateInstances()
--
GitLab