[LNT] r307213 - Followup fix for r306740

[Matthias Braun via llvm-commits]

Author: matze
Date: Wed Jul  5 15:20:46 2017
New Revision: 307213

URL: http://llvm.org/viewvc/llvm-project?rev=307213&view=rev
Log:
Followup fix for r306740

Changed the semantics of the upgrade functions to return the changed
data instead of blindly assuming the data is changed in-place. Forgot to
actually return the changed data in some early-exit cases.

Modified:
    lnt/trunk/lnt/testing/__init__.py

Modified: lnt/trunk/lnt/testing/__init__.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/testing/__init__.py?rev=307213&r1=307212&r2=307213&view=diff
==============================================================================
--- lnt/trunk/lnt/testing/__init__.py (original)
+++ lnt/trunk/lnt/testing/__init__.py Wed Jul  5 15:20:46 2017
@@ -210,7 +210,7 @@ def upgrade_0_to_1(data):
     # If the run order is missing, or wasn't the inferred one, do nothing.
     if run_order is None or (run_order != inferred_run_order and
                              inferred_run_order is not None):
-        return
+        return data
 
     # Otherwise, assume this run order was derived.
 
@@ -231,13 +231,13 @@ def upgrade_0_to_1(data):
                 break
         else:
             # We are done if we didn't find one.
-            return
+            return data
 
         # Extract the build string.
         m = re.match(r'(.*) version ([^ ]*) (\([^(]*\))(.*)',
                      version_ln)
         if not m:
-            return
+            return data
 
         cc_name,cc_version_num,cc_build_string,cc_extra = m.groups()
         m = re.search('clang-([0-9.]*)', cc_build_string)