commit 88721796f31d3fa01908bc0c9539d53fd68ae150
author Andrew Jeffery <andrew@aj.id.au> Mon Apr 30 14:30:32 2018 +0930
committer Andrew Jeffery <andrew@aj.id.au> Mon Apr 30 15:54:35 2018 +0930
tree b79e15493c9042cf1747ca5a8fa3bb65ab357649
parent b720697e0ea0e6c8887390397f0f87f07805ea27

scripts/unit-test.py: Test alternative paths to test-suite.log

Change-Id: I75b046af8e4c287f6e96e5926e728f2307c53852
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>

scripts/unit-test.py

diff --git a/scripts/unit-test.py b/scripts/unit-test.py
index 3bee04c..6b9f6d8 100755
--- a/scripts/unit-test.py
+++ b/scripts/unit-test.py
@@ -442,6 +442,9 @@
         for i in range(0, args.repeat):
             check_call_cmd(os.path.join(WORKSPACE, UNIT_TEST_PKG),  *cmd)
     except CalledProcessError:
-        check_call_cmd(os.path.join(WORKSPACE, UNIT_TEST_PKG), "cat",
-            os.path.join(WORKSPACE, UNIT_TEST_PKG, "test/test-suite.log"))
+        for relpath in ("test/test-suite.log", "src/test/test-suite.log"):
+            log = os.path.join(WORKSPACE, UNIT_TEST_PKG, relpath)
+            if not os.path.exists(log):
+                continue
+            check_call_cmd(os.path.join(WORKSPACE, UNIT_TEST_PKG), "cat", log)
     os.umask(prev_umask)