tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

base: avoid evaluating macro argument multiple times.

Browse source 
Previously, in the regex test helpers, we would evaluate the haystack
expression again to generate the error message, which leads to
nonsensical errors if the expression returns a different value on the
second call (e.g. functions like dlerror which return null on subsequent
calls).

Test: bionic-unit-tests with a failure
Test: treehugger
Change-Id: I2126cefeb45e26638194af8a82d0f2a9d7196edf
This commit is contained in:
Josh Gao 2019-11-05 13:46:14 -08:00
parent 40a8b07e4d
commit 81e316b3a2
1 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
base/include/android-base/test_utils.h
View file

@ -53,30 +53,34 @@ class CapturedStdout : public CapturedStdFd {
CapturedStdout() : CapturedStdFd(STDOUT_FILENO) {}
};
#define ASSERT_MATCH(str, pattern) \
do { \
if (!std::regex_search((str), std::regex((pattern)))) { \
FAIL() << "regex mismatch: expected " << (pattern) << " in:\n" << (str); \
} \
#define ASSERT_MATCH(str, pattern) \
do { \
auto __s = (str); \
if (!std::regex_search(__s, std::regex((pattern)))) { \
FAIL() << "regex mismatch: expected " << (pattern) << " in:\n" << __s; \
} \
} while (0)
#define ASSERT_NOT_MATCH(str, pattern) \
do { \
if (std::regex_search((str), std::regex((pattern)))) { \
FAIL() << "regex mismatch: expected to not find " << (pattern) << " in:\n" << (str); \
} \
#define ASSERT_NOT_MATCH(str, pattern) \
do { \
auto __s = (str); \
if (std::regex_search(__s, std::regex((pattern)))) { \
FAIL() << "regex mismatch: expected to not find " << (pattern) << " in:\n" << __s; \
} \
} while (0)
#define EXPECT_MATCH(str, pattern) \
do { \
if (!std::regex_search((str), std::regex((pattern)))) { \
ADD_FAILURE() << "regex mismatch: expected " << (pattern) << " in:\n" << (str); \
} \
#define EXPECT_MATCH(str, pattern) \
do { \
auto __s = (str); \
if (!std::regex_search(__s, std::regex((pattern)))) { \
ADD_FAILURE() << "regex mismatch: expected " << (pattern) << " in:\n" << __s; \
} \
} while (0)
#define EXPECT_NOT_MATCH(str, pattern) \
do { \
if (std::regex_search((str), std::regex((pattern)))) { \
ADD_FAILURE() << "regex mismatch: expected to not find " << (pattern) << " in:\n" << (str); \
} \
#define EXPECT_NOT_MATCH(str, pattern) \
do { \
auto __s = (str); \
if (std::regex_search(__s, std::regex((pattern)))) { \
ADD_FAILURE() << "regex mismatch: expected to not find " << (pattern) << " in:\n" << __s; \
} \
} while (0)