[Piglit] [PATCH] tests/igt: restore dmesg-by-default

[Daniel Vetter]

This regression has been introduced in

commit 90a25641164c8a0c8cc09a5515864b654df9d368
Author: Dylan Baker <baker.dylan.c at gmail.com>
Date:   Mon Jan 27 11:23:28 2014 -0800

    Use the new dmesg class

The original logic to always capture dmesg for igt tests has been
added in

commit da3819f07ca2b74b386ee96b8af1e141c36ec8ce
Author: Daniel Vetter <daniel.vetter at ffwll.ch>
Date:   Mon Nov 11 22:04:32 2013 +0100

    igt: Enable dmesg checking by default

Cc: Dylan Baker <baker.dylan.c at gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
---
 piglit-resume.py | 4 +++-
 piglit-run.py    | 3 ++-
 tests/igt.py     | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/piglit-resume.py b/piglit-resume.py
index 8a0fbe669f4b..7b82420ebf78 100755
--- a/piglit-resume.py
+++ b/piglit-resume.py
@@ -75,7 +75,9 @@ def main():
         env.exclude_tests.add(key)
     
     profile = core.merge_test_profiles(results.options['profile'])
-    profile.dmesg = env.dmesg
+    if env.dmesg:
+        profile.dmesg = env.dmesg
+
     # This is resumed, don't bother with time since it wont be accurate anyway
     profile.run(env, json_writer)
 
diff --git a/piglit-run.py b/piglit-run.py
index 0dbfa738ccd7..ba5c925c66db 100755
--- a/piglit-run.py
+++ b/piglit-run.py
@@ -157,7 +157,8 @@ def main():
     json_writer.open_dict()
     time_start = time.time()
     # Set the dmesg type
-    profile.dmesg = args.dmesg
+    if args.dmesg:
+        profile.dmesg = args.dmesg
     profile.run(env, json_writer)
     time_end = time.time()
 
diff --git a/tests/igt.py b/tests/igt.py
index b5c9f3c98744..f80a6c4aba66 100644
--- a/tests/igt.py
+++ b/tests/igt.py
@@ -154,3 +154,5 @@ multiTests = listTests("list-multi-tests")
 
 for test in multiTests:
     addSubTestCases(test)
+
+profile.dmesg = True
-- 
1.8.4.rc3