From 235be5b6d9129e380942a0c47037574d263bde11 Mon Sep 17 00:00:00 2001 From: "hyunghwan.chung" Date: Fri, 3 May 2019 07:23:48 +0000 Subject: [PATCH] fixed flaws in t/t.h --- moo/t/Makefile.am | 2 +- moo/t/Makefile.in | 1 + moo/t/t.h | 14 ++++---------- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/moo/t/Makefile.am b/moo/t/Makefile.am index 08073cb..7837047 100644 --- a/moo/t/Makefile.am +++ b/moo/t/Makefile.am @@ -4,7 +4,7 @@ AM_CFLAGS = $(PTHREAD_CFLAGS) AM_CPPFLAGS = \ -I$(abs_builddir) \ - -I$(abs_builddir)../lib \ + -I$(abs_builddir)/../lib \ -I$(abs_srcdir) \ -I$(abs_srcdir)/../lib \ -I$(includedir) diff --git a/moo/t/Makefile.in b/moo/t/Makefile.in index abbbe43..bd0672d 100644 --- a/moo/t/Makefile.in +++ b/moo/t/Makefile.in @@ -336,6 +336,7 @@ AUTOMAKE_OPTIONS = nostdinc AM_CFLAGS = $(PTHREAD_CFLAGS) AM_CPPFLAGS = \ -I$(abs_builddir) \ + -I$(abs_builddir)/../lib \ -I$(abs_srcdir) \ -I$(abs_srcdir)/../lib \ -I$(includedir) diff --git a/moo/t/t.h b/moo/t/t.h index a69f20c..e5e7f49 100644 --- a/moo/t/t.h +++ b/moo/t/t.h @@ -4,19 +4,13 @@ #include #if defined(__STDC_VERSION__) && (__STDC_VERSION__>=199901L) -# define T_ASSERT_FAIL1(msg1) printf("FAILURE in %s[%d] - %s\n", __func__, - (int)__LINE__, msg1) -# define T_ASSERT_FAIL2(msg1,msg2) printf("FAILURE in %s[%d] - %s - %s\n", - __func__, (int)__LINE__, msg1, msg2) +# define T_ASSERT_FAIL1(msg1) printf("FAILURE in %s[%d] - %s\n", __func__, (int)__LINE__, msg1) +# define T_ASSERT_FAIL2(msg1,msg2) printf("FAILURE in %s[%d] - %s - %s\n", __func__, (int)__LINE__, msg1, msg2) #else -# define T_ASSERT_FAIL1(msg1) printf("FAILURE in %s[%d] - %s\n", __FILE__, - (int)__LINE__, msg1) -# define T_ASSERT_FAIL2(msg1,msg2) printf("FAILURE in %s[%d] - %s - %s\n", - __FILE__, (int)__LINE__, msg1, msg2) +# define T_ASSERT_FAIL1(msg1) printf("FAILURE in %s[%d] - %s\n", __FILE__, (int)__LINE__, msg1) +# define T_ASSERT_FAIL2(msg1,msg2) printf("FAILURE in %s[%d] - %s - %s\n", __FILE__, (int)__LINE__, msg1, msg2) #endif - - #define T_ASSERT1(test,msg1) do { if (!(test)) { T_ASSERT_FAIL1(msg1); goto oops; } } while(0) #define T_ASSERT2(test,msg1,msg2) do { if (!(test)) { T_ASSERT_FAIL2(msg1,msg2); goto oops; } } while(0)