Browse Source

[2899] explicitly LDADD libb10-threads from log lock test

seems to be necessary for some OS.  also explicitly include the relevant
header file.
JINMEI Tatuya 12 years ago
parent
commit
eacf659330
2 changed files with 5 additions and 0 deletions
  1. 3 0
      src/lib/log/tests/Makefile.am
  2. 2 0
      src/lib/log/tests/logger_lock_test.cc

+ 3 - 0
src/lib/log/tests/Makefile.am

@@ -46,6 +46,8 @@ buffer_logger_test_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
 buffer_logger_test_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
 buffer_logger_test_LDADD += $(AM_LDADD) $(LOG4CPLUS_LIBS)
 
+# This test directly uses libb10-threads, and on some systems it seems to
+# require explicit LDADD (even if libb10-log has indirect dependencies)
 noinst_PROGRAMS += logger_lock_test
 logger_lock_test_SOURCES = logger_lock_test.cc
 nodist_logger_lock_test_SOURCES = log_test_messages.cc log_test_messages.h
@@ -53,6 +55,7 @@ logger_lock_test_CPPFLAGS = $(AM_CPPFLAGS)
 logger_lock_test_LDFLAGS = $(AM_LDFLAGS)
 logger_lock_test_LDADD  = $(top_builddir)/src/lib/log/libb10-log.la
 logger_lock_test_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
+logger_lock_test_LDADD += $(top_builddir)/src/lib/util/threads/libb10-threads.la
 logger_lock_test_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
 logger_lock_test_LDADD += $(AM_LDADD) $(LOG4CPLUS_LIBS)
 

+ 2 - 0
src/lib/log/tests/logger_lock_test.cc

@@ -18,6 +18,8 @@
 #include <log/log_messages.h>
 #include <log/interprocess/interprocess_sync.h>
 #include "log_test_messages.h"
+
+#include <util/threads/sync.h>
 #include <iostream>
 
 using namespace std;