summaryrefslogtreecommitdiff
path: root/src/gtest-typed-test.cc
diff options
context:
space:
mode:
authorvladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>2010-02-03 02:27:02 +0000
committervladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>2010-02-03 02:27:02 +0000
commit673a0cb9079f8f37bd61588a3160e12daf70ec44 (patch)
treeaf456a0d47524f6bb5cbb49d160e0aaf60110daf /src/gtest-typed-test.cc
parent8236131e25705a809d496672a3819e1741166c4b (diff)
downloadgtest-673a0cb9079f8f37bd61588a3160e12daf70ec44.tar.gz
gtest-673a0cb9079f8f37bd61588a3160e12daf70ec44.tar.bz2
gtest-673a0cb9079f8f37bd61588a3160e12daf70ec44.tar.xz
Adds Solaris support (by Hady Zalek)
git-svn-id: http://googletest.googlecode.com/svn/trunk@371 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'src/gtest-typed-test.cc')
-rw-r--r--src/gtest-typed-test.cc12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/gtest-typed-test.cc b/src/gtest-typed-test.cc
index 4a0f657..3cc4b5d 100644
--- a/src/gtest-typed-test.cc
+++ b/src/gtest-typed-test.cc
@@ -37,6 +37,14 @@ namespace internal {
#if GTEST_HAS_TYPED_TEST_P
+// Skips to the first non-space char in str. Returns an empty string if str
+// contains only whitespace characters.
+static const char* SkipSpaces(const char* str) {
+ while (isspace(*str))
+ str++;
+ return str;
+}
+
// Verifies that registered_tests match the test names in
// defined_test_names_; returns registered_tests if successful, or
// aborts the program otherwise.
@@ -45,6 +53,10 @@ const char* TypedTestCasePState::VerifyRegisteredTestNames(
typedef ::std::set<const char*>::const_iterator DefinedTestIter;
registered_ = true;
+ // Skip initial whitespace in registered_tests since some
+ // preprocessors prefix stringizied literals with whitespace.
+ registered_tests = SkipSpaces(registered_tests);
+
Message errors;
::std::set<String> tests;
for (const char* names = registered_tests; names != NULL;