Make it easier for automated test platforms to parse the test results.

Signed-off-by: Brenda J. Butler <b...@mojatatu.com>
---
 tools/testing/selftests/tc-testing/plugin-lib/valgrindPlugin.py | 2 +-
 tools/testing/selftests/tc-testing/tdc.py                       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/testing/selftests/tc-testing/plugin-lib/valgrindPlugin.py 
b/tools/testing/selftests/tc-testing/plugin-lib/valgrindPlugin.py
index 477a7bd7d7fb..432c164ef6ad 100644
--- a/tools/testing/selftests/tc-testing/plugin-lib/valgrindPlugin.py
+++ b/tools/testing/selftests/tc-testing/plugin-lib/valgrindPlugin.py
@@ -131,7 +131,7 @@ class SubPlugin(TdcPlugin):
         if (def_num > 0) or (ind_num > 0) or (pos_num > 0) or (nle_num > 0):
             mem_results += 'not '
 
-        mem_results += 'ok {} - {}-mem # {}\n'.format(
+        mem_results += 'ok {} {}-mem - {}\n'.format(
             self.args.test_ordinal, self.args.testid, 'memory leak check')
         self._add_to_tap(mem_results)
         if mem_results.startswith('not '):
diff --git a/tools/testing/selftests/tc-testing/tdc.py 
b/tools/testing/selftests/tc-testing/tdc.py
index 7b50775abaf6..2ac0a9e4c597 100755
--- a/tools/testing/selftests/tc-testing/tdc.py
+++ b/tools/testing/selftests/tc-testing/tdc.py
@@ -213,7 +213,7 @@ def run_one_test(pm, args, index, tidx):
 
     if not result:
         tresult += 'not '
-    tresult += 'ok {} - {} # {}\n'.format(str(index), tidx['id'], tidx['name'])
+    tresult += 'ok {} {} - {}\n'.format(str(index), tidx['id'], tidx['name'])
     tap += tresult
 
     if result == False:
@@ -307,8 +307,8 @@ def test_runner(pm, args, filtered_tests):
     if tcount + 1 != index:
         for tidx in testlist[index - 1:]:
             msg = 'skipped - previous {} failed'.format(stage)
-            tap += 'ok {} - {} # {} {} {}\n'.format(
-                count, tidx['id'], msg, index, badtest.get('id', 
'--Unknown--'))
+            tap += 'ok {} {} - {} # {} {} {}\n'.format(
+                count, tidx['id'], tidx['name'], msg, index, badtest.get('id', 
'--Unknown--'))
             count += 1
 
     tap += 'done flushing skipped test tap output\n'
-- 
2.15.1

Reply via email to