summaryrefslogtreecommitdiff
path: root/shared
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2016-02-11 09:49:01 -0600
committerDan Williams <dcbw@redhat.com>2016-02-11 09:50:29 -0600
commit80d9a43a25053f3071e4745dd5107e7c36b7f41f (patch)
tree330b2912386588f58add97bc963ff6ed953bdb23 /shared
parent007aeba021a1c291b067e18e8604ff1f947c6669 (diff)
downloadNetworkManager-80d9a43a25053f3071e4745dd5107e7c36b7f41f.tar.gz
tests: get rid of FAIL macro
Diffstat (limited to 'shared')
-rw-r--r--shared/nm-test-utils.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/shared/nm-test-utils.h b/shared/nm-test-utils.h
index b6bc332eb6..89d32ccf8c 100644
--- a/shared/nm-test-utils.h
+++ b/shared/nm-test-utils.h
@@ -1039,16 +1039,10 @@ _nmtst_assert_ip6_address (const char *file, int line, const struct in6_addr *ad
#define nmtst_assert_ip6_address(addr, str_expected) _nmtst_assert_ip6_address (__FILE__, __LINE__, addr, str_expected)
/* Deprecated: don't use this overly verbose macro. */
-#define FAIL(test_name, fmt, ...) \
- G_STMT_START { \
- g_error ("%s:%d: FAIL[%s]: " fmt, __FILE__, __LINE__, test_name, ## __VA_ARGS__); \
- } G_STMT_END
-
-/* Deprecated: don't use this overly verbose macro. */
#define ASSERT(x, test_name, fmt, ...) \
G_STMT_START { \
if (!(x)) { \
- FAIL (test_name, fmt, ## __VA_ARGS__); \
+ g_error ("%s:%d: FAIL[%s]: " fmt, __FILE__, __LINE__, test_name, ## __VA_ARGS__); \
} \
} G_STMT_END