[open-ils-commits] [GIT] Evergreen ILS branch master updated. e5a3ee75ff36d3ace32b6b432e4458432f9d578f

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  e5a3ee75ff36d3ace32b6b432e4458432f9d578f (commit)
      from  82d65eccd0c40ab9e832a6a196b11608aa9520a4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e5a3ee75ff36d3ace32b6b432e4458432f9d578f
Author: Dan Scott <dscott at laurentian.ca>
Date:   Wed Aug 21 11:57:40 2013 -0400

    Make C unit tests more robust
    
    Adding -I at abs_top_srcdir@/Open-ILS/include will pull in the source tree
    header files, so that the C unit tests can run before Evergreen has been
    installed (and thus will be a valid test of the source header files
    instead of relying on the installed versions that might be different).
    
    Build c-apps before recursing into c-apps/tests:
    This ensures that the required libraries are built before the C unit
    tests are built, thus preventing "make check" on a just-configured
    source tree from failing due to missing dependencies.
    
    Also, link to the source tree directories first rather than last, to
    ensure that we pull in the correct source (if possible). And remove the
    cargo-cultish $(TMP) linking/including.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>
    Signed-off-by: Jason Etheridge <jason at esilibrary.com>

diff --git a/Open-ILS/src/c-apps/Makefile.am b/Open-ILS/src/c-apps/Makefile.am
index 3006373..77d48e5 100644
--- a/Open-ILS/src/c-apps/Makefile.am
+++ b/Open-ILS/src/c-apps/Makefile.am
@@ -4,7 +4,7 @@
 # Process this file with automake to generate Makefile.in
 #-----------------------------------------------------------
 
-SUBDIRS = tests
+SUBDIRS = . tests
 
 AM_CFLAGS = $(DEF_CFLAGS) -DOSRF_LOG_PARAMS -I at top_srcdir@/include/
 AM_LDFLAGS = $(DEF_LDFLAGS) -L$(DBI_LIBS) -lopensrf
diff --git a/Open-ILS/src/c-apps/tests/Makefile.am b/Open-ILS/src/c-apps/tests/Makefile.am
index df9439f..67b258d 100644
--- a/Open-ILS/src/c-apps/tests/Makefile.am
+++ b/Open-ILS/src/c-apps/tests/Makefile.am
@@ -1,10 +1,10 @@
-export DEF_LDFLAGS = -L. -L$(TMP) -L$(OPENSRF_LIBS)
-export DEF_CFLAGS = -D_LARGEFILE64_SOURCE -pipe -g -Wall -O2 -fPIC -I at top_srcdir@/include -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS)  -I$(LIBXML2_HEADERS)/libxml  -I$(TMP) -I$(OPENSRF_HEADERS)
+export DEF_LDFLAGS = -L at abs_top_srcdir@/Open-ILS/src/c-apps -L$(OPENSRF_LIBS)
+export DEF_CFLAGS = -D_LARGEFILE64_SOURCE -pipe -g -Wall -O2 -fPIC -I at abs_top_srcdir@/Open-ILS/include -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS) -I$(LIBXML2_HEADERS)/libxml -I$(OPENSRF_HEADERS)
 export DEF_LDLIBS = -lopensrf
 
 COMMON = testsuite.c
 AM_CFLAGS = $(DEF_CFLAGS) -DOSRF_LOG_PARAMS
-AM_LDFLAGS = $(DEF_LDLIBS) -L$(DBI_LIBS)
+AM_LDFLAGS = $(DEF_LDFLAGS) $(DEF_LDLIBS) -L$(DBI_LIBS)
 
 TESTS = check_util check_idl
 check_PROGRAMS = check_util check_idl

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/c-apps/Makefile.am       |    2 +-
 Open-ILS/src/c-apps/tests/Makefile.am |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS