Fix error handling in x509_lu.c

[thirdparty/openssl.git] / test / errtest.c

diff --git a/test/errtest.c b/test/errtest.c
index 1a18335b6e4245bd70fe58fa819e042e1ade4b1d..ffe6532240dba2d982a6ee5ebddf1db9dfc74f9e 100644 (file)
--- a/test/errtest.c
+++ b/test/errtest.c
@@ -44,22 +44,32 @@ static int vdata_appends(void)
     return TEST_str_eq(data, "hello world");
 }
 
-/* Test that setting a platform error sets the right values. */
-static int platform_error(void)
+static int raised_error(void)
 {
-    const char *file, *f, *data;
-    int line;
+    const char *f, *data;
     int l;
     unsigned long e;
 
+    /*
+     * When OPENSSL_NO_ERR or OPENSSL_NO_FILENAMES, no file name or line
+     * number is saved, so no point checking them.
+     */
+#if !defined(OPENSSL_NO_FILENAMES) && !defined(OPENSSL_NO_ERR)
+    const char *file;
+    int line;
+
     file = __FILE__;
-    line = __LINE__ + 1; /* The error is generated on the next line */
-    FUNCerr("exit", ERR_R_INTERNAL_ERROR);
+    line = __LINE__ + 2; /* The error is generated on the ERR_raise_data line */
+#endif
+    ERR_raise_data(ERR_LIB_SYS, ERR_R_INTERNAL_ERROR,
+                   "calling exit()");
     if (!TEST_ulong_ne(e = ERR_get_error_line_data(&f, &l, &data, NULL), 0)
             || !TEST_int_eq(ERR_GET_REASON(e), ERR_R_INTERNAL_ERROR)
+#if !defined(OPENSSL_NO_FILENAMES) && !defined(OPENSSL_NO_ERR)
             || !TEST_int_eq(l, line)
             || !TEST_str_eq(f, file)
-            || !TEST_str_eq(data, "calling function exit"))
+#endif
+            || !TEST_str_eq(data, "calling exit()"))
         return 0;
     return 1;
 }
@@ -68,6 +78,6 @@ int setup_tests(void)
 {
     ADD_TEST(preserves_system_error);
     ADD_TEST(vdata_appends);
-    ADD_TEST(platform_error);
+    ADD_TEST(raised_error);
     return 1;
 }