[SSSD] [PATCH] TEST: Some macros aren't defined in older version of check.

Lukas Slebodnik lslebodn at redhat.com
Tue Apr 22 07:55:03 UTC 2014


ehlo,

attached patch fixes errors on RHEL6

LS
-------------- next part --------------
>From 6364af1a607631d7d7de41bc473eb6b9a9dc4a34 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Tue, 22 Apr 2014 09:36:44 +0200
Subject: [PATCH] TEST: Some macros aren't defined in older version of check.

src/tests/sbus_codegen_tests-sbus_codegen_tests.o: In function `eject_handler':
tests/sbus_codegen_tests.c:229: undefined reference to `ck_assert_uint_eq'
tests/sbus_codegen_tests.c:235: undefined reference to `ck_assert_uint_eq'
tests/sbus_codegen_tests.c:239: undefined reference to `ck_assert_uint_eq'
src/tests/sbus_codegen_tests-sbus_codegen_tests.o: In function `test_marshal_basic_types':
src/tests/sbus_codegen_tests.c:446: undefined reference to `ck_assert_uint_eq'
src/tests/sbus_codegen_tests.c:449: undefined reference to `ck_assert_uint_eq'
src/tests/sbus_codegen_tests-sbus_codegen_tests.o:
src/tests/sbus_codegen_tests.c:451: more undefined references to `ck_assert_uint_eq' follow
collect2: ld returned 1 exit status
make[3]: *** [sbus_codegen_tests] Error 1
---
 src/tests/sbus_codegen_tests.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/tests/sbus_codegen_tests.c b/src/tests/sbus_codegen_tests.c
index d9da5c0ce9394880eebad45fb2cef32aad2e1026..b57c7792b646d92bbc1d8e03ac557a86ff9670c2 100644
--- a/src/tests/sbus_codegen_tests.c
+++ b/src/tests/sbus_codegen_tests.c
@@ -33,6 +33,19 @@
 #include "tests/sbus_codegen_tests_generated.h"
 #include "util/util_errors.h"
 
+
+#ifndef _ck_assert_uint
+#define _ck_assert_uint(X, OP, Y) do { \
+    uintmax_t _ck_x = (X); \
+    uintmax_t _ck_y = (Y); \
+    ck_assert_msg(_ck_x OP _ck_y, "Assertion '"#X#OP#Y"' failed: "#X"==%ju, "#Y"==%ju", _ck_x, _ck_y); \
+} while (0)
+#endif /* _ck_assert_uint */
+
+#ifndef ck_assert_uint_eq
+#define ck_assert_uint_eq(X, Y) _ck_assert_uint(X, ==, Y)
+#endif /* ck_assert_uint_eq */
+
 static const struct sbus_arg_meta *
 find_arg(const struct sbus_arg_meta *args,
          const char *name)
-- 
1.9.0



More information about the sssd-devel mailing list