scripts/patchtest: simplify run()

Set premerge_result and postmerge_result directly by calling
getResult(), instead of doing it in multiple stages with confusing
variable names.

Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/scripts/patchtest b/scripts/patchtest
index aef80a86bbafe441fa50e261e7cc7f0cc40a0115..d2f6302743ab74a92e6cfa6af62db43ca982c115 100755 (executable)
--- a/scripts/patchtest
+++ b/scripts/patchtest
@@ -141,13 +141,8 @@ def run(patch, logfile=None):
     # Get the result class and install the control-c handler
     unittest.installHandler()
 
-    # run pre-merge tests, meaning those methods with 'pretest' as prefix
-    premerge_resultklass = getResult(patch, False, logfile)
-    premerge_result = _runner(premerge_resultklass, 'pretest')
-
-    # run post-merge tests, meaning those methods with 'test' as prefix
-    postmerge_resultklass = getResult(patch, True, logfile)
-    postmerge_result = _runner(postmerge_resultklass, 'test')
+    premerge_result = _runner(getResult(patch, False, logfile), 'pretest')
+    postmerge_result = _runner(getResult(patch, True, logfile), 'test')
 
     print_result_message(premerge_result, postmerge_result)
     return premerge_result or postmerge_result