MdePkg: Reproduce builds across source format changes

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3688

* Use DEBUG_LINE_NUMBER instead of __LINE__.
* Use DEBUG_EXPRESSION_STRING instead of #Expression.

Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Zhiguang Liu <zhiguang.liu@intel.com>
Cc: Michael Kubacki <michael.kubacki@microsoft.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Tested-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

diff --git a/MdePkg/Include/Library/UnitTestLib.h b/MdePkg/Include/Library/UnitTestLib.h
index 99175496c8cd1f0ef88156f6ba89ca73d99def7e..142e865cb219990eb5fdf179c2495d4b448328ec 100644 (file)
--- a/MdePkg/Include/Library/UnitTestLib.h
+++ b/MdePkg/Include/Library/UnitTestLib.h
@@ -347,9 +347,9 @@ SaveFrameworkState (
 \r
   @param[in]  Expression  Expression to be evaluated for TRUE.\r
 **/\r
 \r
   @param[in]  Expression  Expression to be evaluated for TRUE.\r
 **/\r

-#define UT_ASSERT_TRUE(Expression)                                                        \\r
-  if(!UnitTestAssertTrue ((Expression), __FUNCTION__, __LINE__, __FILE__, #Expression)) { \\r
-    return UNIT_TEST_ERROR_TEST_FAILED;                                                   \\r
+#define UT_ASSERT_TRUE(Expression)                                                                 \\r
+  if(!UnitTestAssertTrue ((Expression), __FUNCTION__, DEBUG_LINE_NUMBER, __FILE__, #Expression)) { \\r
+    return UNIT_TEST_ERROR_TEST_FAILED;                                                            \\r

   }\r
 \r
 /**\r
   }\r
 \r
 /**\r


@@ -359,9 +359,9 @@ SaveFrameworkState (
 \r
   @param[in]  Expression  Expression to be evaluated for FALSE.\r
 **/\r
 \r
   @param[in]  Expression  Expression to be evaluated for FALSE.\r
 **/\r

-#define UT_ASSERT_FALSE(Expression)                                                        \\r
-  if(!UnitTestAssertFalse ((Expression), __FUNCTION__, __LINE__, __FILE__, #Expression)) { \\r
-    return UNIT_TEST_ERROR_TEST_FAILED;                                                    \\r
+#define UT_ASSERT_FALSE(Expression)                                                                 \\r
+  if(!UnitTestAssertFalse ((Expression), __FUNCTION__, DEBUG_LINE_NUMBER, __FILE__, #Expression)) { \\r
+    return UNIT_TEST_ERROR_TEST_FAILED;                                                             \\r

   }\r
 \r
 /**\r
   }\r
 \r
 /**\r


@@ -373,7 +373,7 @@ SaveFrameworkState (
   @param[in]  ValueB  Value to be compared for equality (64-bit comparison).\r
 **/\r
 #define UT_ASSERT_EQUAL(ValueA, ValueB)                                                                           \\r
   @param[in]  ValueB  Value to be compared for equality (64-bit comparison).\r
 **/\r
 #define UT_ASSERT_EQUAL(ValueA, ValueB)                                                                           \\r

-  if(!UnitTestAssertEqual ((UINT64)(ValueA), (UINT64)(ValueB), __FUNCTION__, __LINE__, __FILE__, #ValueA, #ValueB)) { \\r
+  if(!UnitTestAssertEqual ((UINT64)(ValueA), (UINT64)(ValueB), __FUNCTION__, DEBUG_LINE_NUMBER, __FILE__, #ValueA, #ValueB)) { \\r

     return UNIT_TEST_ERROR_TEST_FAILED;                                                                           \\r
   }\r
 \r
     return UNIT_TEST_ERROR_TEST_FAILED;                                                                           \\r
   }\r
 \r


@@ -386,9 +386,9 @@ SaveFrameworkState (
   @param[in]  BufferB  Pointer to a buffer for comparison.\r
   @param[in]  Length   Number of bytes to compare in BufferA and BufferB.\r
 **/\r
   @param[in]  BufferB  Pointer to a buffer for comparison.\r
   @param[in]  Length   Number of bytes to compare in BufferA and BufferB.\r
 **/\r

-#define UT_ASSERT_MEM_EQUAL(BufferA, BufferB, Length)                                                                               \\r
-  if(!UnitTestAssertMemEqual ((VOID *)(UINTN)(BufferA), (VOID *)(UINTN)(BufferB), (UINTN)Length, __FUNCTION__, __LINE__, __FILE__, #BufferA, #BufferB)) { \\r
-    return UNIT_TEST_ERROR_TEST_FAILED;                                                                                           \\r
+#define UT_ASSERT_MEM_EQUAL(BufferA, BufferB, Length)                                                                                                              \\r
+  if(!UnitTestAssertMemEqual ((VOID *)(UINTN)(BufferA), (VOID *)(UINTN)(BufferB), (UINTN)Length, __FUNCTION__, DEBUG_LINE_NUMBER, __FILE__, #BufferA, #BufferB)) { \\r
+    return UNIT_TEST_ERROR_TEST_FAILED;                                                                                                                            \\r

   }\r
 \r
 /**\r
   }\r
 \r
 /**\r


@@ -399,9 +399,9 @@ SaveFrameworkState (
   @param[in]  ValueA  Value to be compared for inequality (64-bit comparison).\r
   @param[in]  ValueB  Value to be compared for inequality (64-bit comparison).\r
 **/\r
   @param[in]  ValueA  Value to be compared for inequality (64-bit comparison).\r
   @param[in]  ValueB  Value to be compared for inequality (64-bit comparison).\r
 **/\r

-#define UT_ASSERT_NOT_EQUAL(ValueA, ValueB)                                                                          \\r
-  if(!UnitTestAssertNotEqual ((UINT64)(ValueA), (UINT64)(ValueB), __FUNCTION__, __LINE__, __FILE__, #ValueA, #ValueB)) { \\r
-    return UNIT_TEST_ERROR_TEST_FAILED;                                                                              \\r
+#define UT_ASSERT_NOT_EQUAL(ValueA, ValueB)                                                                                       \\r
+  if(!UnitTestAssertNotEqual ((UINT64)(ValueA), (UINT64)(ValueB), __FUNCTION__, DEBUG_LINE_NUMBER, __FILE__, #ValueA, #ValueB)) { \\r
+    return UNIT_TEST_ERROR_TEST_FAILED;                                                                                           \\r

   }\r
 \r
 /**\r
   }\r
 \r
 /**\r


@@ -411,9 +411,9 @@ SaveFrameworkState (
 \r
   @param[in]  Status  EFI_STATUS value to check.\r
 **/\r
 \r
   @param[in]  Status  EFI_STATUS value to check.\r
 **/\r

-#define UT_ASSERT_NOT_EFI_ERROR(Status)                                                \\r
-  if(!UnitTestAssertNotEfiError ((Status), __FUNCTION__, __LINE__, __FILE__, #Status)) { \\r
-    return UNIT_TEST_ERROR_TEST_FAILED;                                                \\r
+#define UT_ASSERT_NOT_EFI_ERROR(Status)                                                           \\r
+  if(!UnitTestAssertNotEfiError ((Status), __FUNCTION__, DEBUG_LINE_NUMBER, __FILE__, #Status)) { \\r
+    return UNIT_TEST_ERROR_TEST_FAILED;                                                           \\r

   }\r
 \r
 /**\r
   }\r
 \r
 /**\r


@@ -424,9 +424,9 @@ SaveFrameworkState (
   @param[in]  Status    EFI_STATUS values to compare for equality.\r
   @param[in]  Expected  EFI_STATUS values to compare for equality.\r
 **/\r
   @param[in]  Status    EFI_STATUS values to compare for equality.\r
   @param[in]  Expected  EFI_STATUS values to compare for equality.\r
 **/\r

-#define UT_ASSERT_STATUS_EQUAL(Status, Expected)                                                 \\r
-  if(!UnitTestAssertStatusEqual ((Status), (Expected), __FUNCTION__, __LINE__, __FILE__, #Status)) { \\r
-    return UNIT_TEST_ERROR_TEST_FAILED;                                                          \\r
+#define UT_ASSERT_STATUS_EQUAL(Status, Expected)                                                              \\r
+  if(!UnitTestAssertStatusEqual ((Status), (Expected), __FUNCTION__, DEBUG_LINE_NUMBER, __FILE__, #Status)) { \\r
+    return UNIT_TEST_ERROR_TEST_FAILED;                                                                       \\r

   }\r
 \r
 /**\r
   }\r
 \r
 /**\r


@@ -436,9 +436,9 @@ SaveFrameworkState (
 \r
   @param[in]  Pointer  Pointer to be checked against NULL.\r
 **/\r
 \r
   @param[in]  Pointer  Pointer to be checked against NULL.\r
 **/\r

-#define UT_ASSERT_NOT_NULL(Pointer)                                                  \\r
-  if(!UnitTestAssertNotNull ((Pointer), __FUNCTION__, __LINE__, __FILE__, #Pointer)) { \\r
-    return UNIT_TEST_ERROR_TEST_FAILED;                                              \\r
+#define UT_ASSERT_NOT_NULL(Pointer)                                                             \\r
+  if(!UnitTestAssertNotNull ((Pointer), __FUNCTION__, DEBUG_LINE_NUMBER, __FILE__, #Pointer)) { \\r
+    return UNIT_TEST_ERROR_TEST_FAILED;                                                         \\r

   }\r
 \r
 /**\r
   }\r
 \r
 /**\r


@@ -482,7 +482,7 @@ SaveFrameworkState (
       }                                                                \\r
       if (!UnitTestExpectAssertFailure (                               \\r
              UnitTestJumpStatus,                                       \\r
       }                                                                \\r
       if (!UnitTestExpectAssertFailure (                               \\r
              UnitTestJumpStatus,                                       \\r

-             __FUNCTION__, __LINE__, __FILE__,                         \\r
+             __FUNCTION__, DEBUG_LINE_NUMBER, __FILE__,                \\r

              #FunctionCall, Status)) {                                 \\r
         return UNIT_TEST_ERROR_TEST_FAILED;                            \\r
       }                                                                \\r
              #FunctionCall, Status)) {                                 \\r
         return UNIT_TEST_ERROR_TEST_FAILED;                            \\r
       }                                                                \\r

diff --git a/MdePkg/Library/BaseLib/SafeString.c b/MdePkg/Library/BaseLib/SafeString.c
index 3bb23ca1a1300ebfea08931fb714c74922d1a438..24e818b921ea14e51671bc417e36286612d62d32 100644 (file)
--- a/MdePkg/Library/BaseLib/SafeString.c
+++ b/MdePkg/Library/BaseLib/SafeString.c
@@ -17,7 +17,7 @@
     if (!(Expression)) { \\r
       DEBUG ((DEBUG_VERBOSE, \\r
         "%a(%d) %a: SAFE_STRING_CONSTRAINT_CHECK(%a) failed.  Return %r\n", \\r
     if (!(Expression)) { \\r
       DEBUG ((DEBUG_VERBOSE, \\r
         "%a(%d) %a: SAFE_STRING_CONSTRAINT_CHECK(%a) failed.  Return %r\n", \\r

-        __FILE__, __LINE__, __FUNCTION__, #Expression, Status)); \\r
+        __FILE__, DEBUG_LINE_NUMBER, __FUNCTION__, DEBUG_EXPRESSION_STRING (Expression), Status)); \\r

       return Status; \\r
     } \\r
   } while (FALSE)\r
       return Status; \\r
     } \\r
   } while (FALSE)\r