Allow a simpler form of stats_num_field where all platforms use the same value

1 files changed, 9 insertions, 5 deletions

diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index c9884347c7..4c9b2c269e 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -258,12 +258,16 @@ def _stats_num_field( name, opts, field, expecteds ):
     if field in opts.stats_range_fields:
         framework_fail(name, 'duplicate-numfield', 'Duplicate ' + field + ' num_field check')
 
-    for (b, expected, dev) in expecteds:
-        if b:
-            opts.stats_range_fields[field] = (expected, dev)
-            return
+    if type(expecteds) is types.ListType:
+        for (b, expected, dev) in expecteds:
+            if b:
+                opts.stats_range_fields[field] = (expected, dev)
+                return
+        framework_fail(name, 'numfield-no-expected', 'No expected value found for ' + field + ' in num_field check')
 
-    framework_fail(name, 'numfield-no-expected', 'No expected value found for ' + field + ' in num_field check')
+    else:
+        (expected, dev) = expecteds
+        opts.stats_range_fields[field] = (expected, dev)
 
 def stats_range_field( field, expected, dev ):
     return stats_num_field( field, [(True, expected, dev)] )