[llvm-commits] [zorg] r150753 - in /zorg/trunk/lnt/lnt: server/db/testsuitetypes.py tests/compile.py

[Daniel Dunbar]

Author: ddunbar
Date: Thu Feb 16 16:54:49 2012
New Revision: 150753

URL: http://llvm.org/viewvc/llvm-project?rev=150753&view=rev
Log:
[lnt] lnt.tests.compile: Fix the reporting of test failures, and adjust test suite definition to match current practice.

Modified:
    zorg/trunk/lnt/lnt/server/db/testsuitetypes.py
    zorg/trunk/lnt/lnt/tests/compile.py

Modified: zorg/trunk/lnt/lnt/server/db/testsuitetypes.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/server/db/testsuitetypes.py?rev=150753&r1=150752&r2=150753&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/server/db/testsuitetypes.py (original)
+++ zorg/trunk/lnt/lnt/server/db/testsuitetypes.py Thu Feb 16 16:54:49 2012
@@ -23,11 +23,11 @@
     ts.order_fields.append(testsuite.OrderField("llvm_project_revision",
                                                 "run_order", 0))
 
-    # We expect up to five fields per test, with a sole shared status field.
-    status = testsuite.SampleField(
-            "status", db.status_sample_type, ".status")
-    ts.sample_fields.append(status)
+    # We expect up to five fields per test, each with a status field.
     for name in ('user', 'sys', 'wall', 'size', 'mem'):
+        status = testsuite.SampleField(
+            "%s_status" % (name,), db.status_sample_type, "%s.status" % (name,))
+        ts.sample_fields.append(status)
         value = testsuite.SampleField(
             "%s_time" % (name,), db.real_sample_type, ".%s" % (name,),
             status_field = status)

Modified: zorg/trunk/lnt/lnt/tests/compile.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/tests/compile.py?rev=150753&r1=150752&r2=150753&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/tests/compile.py (original)
+++ zorg/trunk/lnt/lnt/tests/compile.py Thu Feb 16 16:54:49 2012
@@ -625,7 +625,8 @@
                     test_name = '%s.%s' % (tag, name)
                     if not success:
                         testsamples.append(lnt.testing.TestSamples(
-                                test_name + '.failed', [1], info))
+                                test_name + '.status', [lnt.testing.FAIL],
+                                info))
                     if samples:
                         testsamples.append(lnt.testing.TestSamples(
                                 test_name, samples, info))