]> git.puffer.fish Git - mirror/frr.git/commitdiff
tests: analyze should also check /tmp/topotests/topotests.xml
authorChristian Hopps <chopps@labn.net>
Thu, 24 Feb 2022 00:20:31 +0000 (19:20 -0500)
committerChristian Hopps <chopps@labn.net>
Mon, 14 Mar 2022 15:14:12 +0000 (11:14 -0400)
Signed-off-by: Christian Hopps <chopps@labn.net>
tests/topotests/analyze.py

index 888e706339b2d8966905d57a4174042b82dc5ce6..bdb2e56ee1d80b24913363a54c0138a96c68278f 100755 (executable)
@@ -198,9 +198,12 @@ def main():
                 logging.critical("%s doesn't exist", args.results)
                 sys.exit(1)
             ttfiles = [args.results]
+        elif os.path.exists("/tmp/topotests/topotests.xml"):
+            ttfiles.append("/tmp/topotests/topotests.xml")
 
-        if not ttfiles and os.path.exists("/tmp/topotests.xml"):
-            ttfiles.append("/tmp/topotests.xml")
+        if not ttfiles:
+            if os.path.exists("/tmp/topotests.xml"):
+                ttfiles.append("/tmp/topotests.xml")
 
     for f in ttfiles:
         m = re.match(r"tt-group-(\d+)/topotests.xml", f)