Fix parsing of --gtest_list_tests output.

R=machenbach@chromium.org

Review URL: https://codereview.chromium.org/485273004

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@23273 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/test/base-unittests/testcfg.py b/test/base-unittests/testcfg.py
index 0ed46dc..b6ae5b2 100644 (file)
--- a/test/base-unittests/testcfg.py
+++ b/test/base-unittests/testcfg.py
@@ -28,10 +28,11 @@ class BaseUnitTestsSuite(testsuite.TestSuite):
       return []
     tests = []
     test_case = ''
-    for test_desc in output.stdout.strip().split():
+    for line in output.stdout.splitlines():
+      test_desc = line.strip().split()[0]
       if test_desc.endswith('.'):
         test_case = test_desc
-      else:
+      elif test_case and test_desc:
         test = testcase.TestCase(self, test_case + test_desc, dependency=None)
         tests.append(test)
     tests.sort()

diff --git a/test/compiler-unittests/testcfg.py b/test/compiler-unittests/testcfg.py
index 4eec956..b067aee 100644 (file)
--- a/test/compiler-unittests/testcfg.py
+++ b/test/compiler-unittests/testcfg.py
@@ -28,10 +28,11 @@ class CompilerUnitTestsSuite(testsuite.TestSuite):
       return []
     tests = []
     test_case = ''
-    for test_desc in output.stdout.strip().split():
+    for line in output.stdout.splitlines():
+      test_desc = line.strip().split()[0]
       if test_desc.endswith('.'):
         test_case = test_desc
-      else:
+      elif test_case and test_desc:
         test = testcase.TestCase(self, test_case + test_desc, dependency=None)
         tests.append(test)
     tests.sort()

diff --git a/test/heap-unittests/testcfg.py b/test/heap-unittests/testcfg.py
index 7c80a75..ffa4b59 100644 (file)
--- a/test/heap-unittests/testcfg.py
+++ b/test/heap-unittests/testcfg.py
@@ -28,10 +28,11 @@ class HeapUnitTestsSuite(testsuite.TestSuite):
       return []
     tests = []
     test_case = ''
-    for test_desc in output.stdout.strip().split():
+    for line in output.stdout.splitlines():
+      test_desc = line.strip().split()[0]
       if test_desc.endswith('.'):
         test_case = test_desc
-      else:
+      elif test_case and test_desc:
         test = testcase.TestCase(self, test_case + test_desc, dependency=None)
         tests.append(test)
     tests.sort()

diff --git a/test/runtime-unittests/testcfg.py b/test/runtime-unittests/testcfg.py
index f89fadc..0b4af6d 100644 (file)
--- a/test/runtime-unittests/testcfg.py
+++ b/test/runtime-unittests/testcfg.py
@@ -28,10 +28,11 @@ class RuntimeUnitTestsSuite(testsuite.TestSuite):
       return []
     tests = []
     test_case = ''
-    for test_desc in output.stdout.strip().split():
+    for line in output.stdout.splitlines():
+      test_desc = line.strip().split()[0]
       if test_desc.endswith('.'):
         test_case = test_desc
-      else:
+      elif test_case and test_desc:
         test = testcase.TestCase(self, test_case + test_desc, dependency=None)
         tests.append(test)
     tests.sort()