commit 19008a15a3bb670e7f455683b7b4873658f6dee1
author Stefan Fuhrmann <stefan2@apache.org> Sat Apr 10 15:49:44 2021 +0000
committer Stefan Fuhrmann <stefan2@apache.org> Sat Apr 10 15:49:44 2021 +0000
tree c29a9da07c100ca4df8efc2537c694fa7315d892
parent d13b76d4d27eabab54e8081a6353526d49ede1e8

Fix GCC "warning: ‘%s’ directive argument is null" in tests.

* subversion/tests/svn_test.h
  (SVN_TEST_STRING_ASSERT): Don't pass NULL as strings into formatters.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1888590 13f79535-47bb-0310-9956-ffa450edef68

subversion/tests/svn_test.h

diff --git a/subversion/tests/svn_test.h b/subversion/tests/svn_test.h
index 4d9ddc8..0323c29 100644
--- a/subversion/tests/svn_test.h
+++ b/subversion/tests/svn_test.h
@@ -124,8 +124,17 @@
                                                                     \
     if (tst_str2 == NULL && tst_str1 == NULL)                       \
       break;                                                        \
-    if ((tst_str1 == NULL) || (tst_str2 == NULL)                    \
-        || (strcmp(tst_str2, tst_str1) != 0))                       \
+    if (tst_str1 == NULL)                                           \
+      return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,           \
+          "Strings not equal\n  Expected: '%s'\n  Found:    NULL"   \
+          "\n  at %s:%d",                                           \
+          tst_str2, __FILE__, __LINE__);                            \
+    if (tst_str2 == NULL)                                           \
+      return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,           \
+          "Strings not equal\n  Expected: NULL\n  Found:    '%s'"   \
+          "\n  at %s:%d",                                           \
+          tst_str1, __FILE__, __LINE__);                            \
+    if (strcmp(tst_str2, tst_str1) != 0)                            \
       return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,           \
           "Strings not equal\n  Expected: '%s'\n  Found:    '%s'"   \
           "\n  at %s:%d",                                           \