From ce14025ed2ca305737f18a94005f1ec417d325ec Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sat, 4 Jun 2016 18:24:23 +0200 Subject: [PATCH] testing: Evaluate expressions only once in EXPECT_EQ_STR(). --- src/testing.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/testing.h b/src/testing.h index 2e4bf054..1bcc276c 100644 --- a/src/testing.h +++ b/src/testing.h @@ -56,12 +56,14 @@ static int check_count__ = 0; #define OK(cond) OK1(cond, #cond) #define EXPECT_EQ_STR(expect, actual) do { \ - if (strcmp (expect, actual) != 0) { \ + /* Evaluate 'actual' only once. */ \ + const char *got__ = actual; \ + if (strcmp (expect, got__) != 0) { \ printf ("not ok %i - %s = \"%s\", want \"%s\"\n", \ - ++check_count__, #actual, actual, expect); \ + ++check_count__, #actual, got__, expect); \ return (-1); \ } \ - printf ("ok %i - %s = \"%s\"\n", ++check_count__, #actual, actual); \ + printf ("ok %i - %s = \"%s\"\n", ++check_count__, #actual, got__); \ } while (0) #define EXPECT_EQ_INT(expect, actual) do { \ -- 2.11.0