diff options
| author | Michael D Kinney <michael.d.kinney@intel.com> | 2021-11-01 13:39:13 -0700 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2021-11-08 18:01:35 +0000 |
| commit | 5948ec36479f08b282fb68e16c731739748bafcf (patch) | |
| tree | 73d5fadde54bfdaea8e2db30d8d2875c51928507 /MdePkg | |
| parent | 48452993ad2f6b880f12f0e48512d86e8c5a22e9 (diff) | |
| download | edk2-5948ec36479f08b282fb68e16c731739748bafcf.tar.gz edk2-5948ec36479f08b282fb68e16c731739748bafcf.tar.bz2 edk2-5948ec36479f08b282fb68e16c731739748bafcf.zip | |
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>
Diffstat (limited to 'MdePkg')
| -rw-r--r-- | MdePkg/Include/Library/UnitTestLib.h | 46 | ||||
| -rw-r--r-- | MdePkg/Library/BaseLib/SafeString.c | 2 |
2 files changed, 24 insertions, 24 deletions
diff --git a/MdePkg/Include/Library/UnitTestLib.h b/MdePkg/Include/Library/UnitTestLib.h index 99175496c8..142e865cb2 100644 --- a/MdePkg/Include/Library/UnitTestLib.h +++ b/MdePkg/Include/Library/UnitTestLib.h @@ -347,9 +347,9 @@ SaveFrameworkState ( @param[in] Expression Expression to be evaluated for TRUE.
**/
-#define UT_ASSERT_TRUE(Expression) \
- if(!UnitTestAssertTrue ((Expression), __FUNCTION__, __LINE__, __FILE__, #Expression)) { \
- return UNIT_TEST_ERROR_TEST_FAILED; \
+#define UT_ASSERT_TRUE(Expression) \
+ if(!UnitTestAssertTrue ((Expression), __FUNCTION__, DEBUG_LINE_NUMBER, __FILE__, #Expression)) { \
+ return UNIT_TEST_ERROR_TEST_FAILED; \
}
/**
@@ -359,9 +359,9 @@ SaveFrameworkState ( @param[in] Expression Expression to be evaluated for FALSE.
**/
-#define UT_ASSERT_FALSE(Expression) \
- if(!UnitTestAssertFalse ((Expression), __FUNCTION__, __LINE__, __FILE__, #Expression)) { \
- return UNIT_TEST_ERROR_TEST_FAILED; \
+#define UT_ASSERT_FALSE(Expression) \
+ if(!UnitTestAssertFalse ((Expression), __FUNCTION__, DEBUG_LINE_NUMBER, __FILE__, #Expression)) { \
+ return UNIT_TEST_ERROR_TEST_FAILED; \
}
/**
@@ -373,7 +373,7 @@ SaveFrameworkState ( @param[in] ValueB Value to be compared for equality (64-bit comparison).
**/
#define UT_ASSERT_EQUAL(ValueA, ValueB) \
- if(!UnitTestAssertEqual ((UINT64)(ValueA), (UINT64)(ValueB), __FUNCTION__, __LINE__, __FILE__, #ValueA, #ValueB)) { \
+ if(!UnitTestAssertEqual ((UINT64)(ValueA), (UINT64)(ValueB), __FUNCTION__, DEBUG_LINE_NUMBER, __FILE__, #ValueA, #ValueB)) { \
return UNIT_TEST_ERROR_TEST_FAILED; \
}
@@ -386,9 +386,9 @@ SaveFrameworkState ( @param[in] BufferB Pointer to a buffer for comparison.
@param[in] Length Number of bytes to compare in BufferA and BufferB.
**/
-#define UT_ASSERT_MEM_EQUAL(BufferA, BufferB, Length) \
- if(!UnitTestAssertMemEqual ((VOID *)(UINTN)(BufferA), (VOID *)(UINTN)(BufferB), (UINTN)Length, __FUNCTION__, __LINE__, __FILE__, #BufferA, #BufferB)) { \
- return UNIT_TEST_ERROR_TEST_FAILED; \
+#define UT_ASSERT_MEM_EQUAL(BufferA, BufferB, Length) \
+ if(!UnitTestAssertMemEqual ((VOID *)(UINTN)(BufferA), (VOID *)(UINTN)(BufferB), (UINTN)Length, __FUNCTION__, DEBUG_LINE_NUMBER, __FILE__, #BufferA, #BufferB)) { \
+ return UNIT_TEST_ERROR_TEST_FAILED; \
}
/**
@@ -399,9 +399,9 @@ SaveFrameworkState ( @param[in] ValueA Value to be compared for inequality (64-bit comparison).
@param[in] ValueB Value to be compared for inequality (64-bit comparison).
**/
-#define UT_ASSERT_NOT_EQUAL(ValueA, ValueB) \
- if(!UnitTestAssertNotEqual ((UINT64)(ValueA), (UINT64)(ValueB), __FUNCTION__, __LINE__, __FILE__, #ValueA, #ValueB)) { \
- return UNIT_TEST_ERROR_TEST_FAILED; \
+#define UT_ASSERT_NOT_EQUAL(ValueA, ValueB) \
+ if(!UnitTestAssertNotEqual ((UINT64)(ValueA), (UINT64)(ValueB), __FUNCTION__, DEBUG_LINE_NUMBER, __FILE__, #ValueA, #ValueB)) { \
+ return UNIT_TEST_ERROR_TEST_FAILED; \
}
/**
@@ -411,9 +411,9 @@ SaveFrameworkState ( @param[in] Status EFI_STATUS value to check.
**/
-#define UT_ASSERT_NOT_EFI_ERROR(Status) \
- if(!UnitTestAssertNotEfiError ((Status), __FUNCTION__, __LINE__, __FILE__, #Status)) { \
- return UNIT_TEST_ERROR_TEST_FAILED; \
+#define UT_ASSERT_NOT_EFI_ERROR(Status) \
+ if(!UnitTestAssertNotEfiError ((Status), __FUNCTION__, DEBUG_LINE_NUMBER, __FILE__, #Status)) { \
+ return UNIT_TEST_ERROR_TEST_FAILED; \
}
/**
@@ -424,9 +424,9 @@ SaveFrameworkState ( @param[in] Status EFI_STATUS values to compare for equality.
@param[in] Expected EFI_STATUS values to compare for equality.
**/
-#define UT_ASSERT_STATUS_EQUAL(Status, Expected) \
- if(!UnitTestAssertStatusEqual ((Status), (Expected), __FUNCTION__, __LINE__, __FILE__, #Status)) { \
- return UNIT_TEST_ERROR_TEST_FAILED; \
+#define UT_ASSERT_STATUS_EQUAL(Status, Expected) \
+ if(!UnitTestAssertStatusEqual ((Status), (Expected), __FUNCTION__, DEBUG_LINE_NUMBER, __FILE__, #Status)) { \
+ return UNIT_TEST_ERROR_TEST_FAILED; \
}
/**
@@ -436,9 +436,9 @@ SaveFrameworkState ( @param[in] Pointer Pointer to be checked against NULL.
**/
-#define UT_ASSERT_NOT_NULL(Pointer) \
- if(!UnitTestAssertNotNull ((Pointer), __FUNCTION__, __LINE__, __FILE__, #Pointer)) { \
- return UNIT_TEST_ERROR_TEST_FAILED; \
+#define UT_ASSERT_NOT_NULL(Pointer) \
+ if(!UnitTestAssertNotNull ((Pointer), __FUNCTION__, DEBUG_LINE_NUMBER, __FILE__, #Pointer)) { \
+ return UNIT_TEST_ERROR_TEST_FAILED; \
}
/**
@@ -482,7 +482,7 @@ SaveFrameworkState ( } \
if (!UnitTestExpectAssertFailure ( \
UnitTestJumpStatus, \
- __FUNCTION__, __LINE__, __FILE__, \
+ __FUNCTION__, DEBUG_LINE_NUMBER, __FILE__, \
#FunctionCall, Status)) { \
return UNIT_TEST_ERROR_TEST_FAILED; \
} \
diff --git a/MdePkg/Library/BaseLib/SafeString.c b/MdePkg/Library/BaseLib/SafeString.c index 3bb23ca1a1..24e818b921 100644 --- a/MdePkg/Library/BaseLib/SafeString.c +++ b/MdePkg/Library/BaseLib/SafeString.c @@ -17,7 +17,7 @@ if (!(Expression)) { \
DEBUG ((DEBUG_VERBOSE, \
"%a(%d) %a: SAFE_STRING_CONSTRAINT_CHECK(%a) failed. Return %r\n", \
- __FILE__, __LINE__, __FUNCTION__, #Expression, Status)); \
+ __FILE__, DEBUG_LINE_NUMBER, __FUNCTION__, DEBUG_EXPRESSION_STRING (Expression), Status)); \
return Status; \
} \
} while (FALSE)
|