Skip to content

Commit

Permalink
Merge pull request ESMCI#1545 from NCAR/ejh_travis_2
Browse files Browse the repository at this point in the history
trying a warning checking build in travis
  • Loading branch information
edhartnett authored Jun 27, 2019
2 parents dfae365 + 9026e79 commit 1994cde
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 13 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,14 @@ env:
- LDFLAGS='-L/usr/lib'

script:
- ls -l /usr/include
- autoreconf -i
- export CFLAGS='-std=c99 -fsanitize=address -fno-omit-frame-pointer'
- export FFLAGS='-fsanitize=address -fno-omit-frame-pointer'
- export FCFLAGS='-fsanitize=address -fno-omit-frame-pointer'
- export DISTCHECK_CONFIGURE_FLAGS='--enable-fortran'
- ./configure --enable-fortran --enable-developer-docs
- make
- make -j distcheck
- make -j distclean
- rm -rf build
- mkdir build
- cd build
Expand Down
2 changes: 1 addition & 1 deletion examples/c/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Ed Hartnett 5/7/18

# Link to our assembled library.
LDADD = ${top_builddir}/src/clib/libpio.la
LDADD = ${top_builddir}/src/clib/libpioc.la
AM_CPPFLAGS = -I$(top_srcdir)/src/clib

# Build the tests for make check.
Expand Down
6 changes: 3 additions & 3 deletions src/clib/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
# Ed Hartnett 8/19/17

# The library we are building.
lib_LTLIBRARIES = libpio.la
lib_LTLIBRARIES = libpioc.la

# These linker flags specify libtool version info.
# See http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning
# for information regarding incrementing `-version-info`.
libpio_la_LDFLAGS = -version-info 2:0:1
libpioc_la_LDFLAGS = -version-info 2:0:1

# The library header file will be installed in include dir.
include_HEADERS = pio.h

# The library soure files.
libpio_la_SOURCES = bget.c pioc_sc.c pio_darray.c pio_file.c \
libpioc_la_SOURCES = bget.c pioc_sc.c pio_darray.c pio_file.c \
pio_getput_int.c pio_msg.c pio_nc.c pio_rearrange.c pioc.c \
pioc_support.c pio_darray_int.c pio_get_nc.c pio_lists.c pio_nc4.c \
pio_put_nc.c pio_spmd.c pio_get_vard.c pio_put_vard.c pio_internal.h \
Expand Down
3 changes: 1 addition & 2 deletions tests/cunit/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
# Ed Hartnett 8/17/17

# Link to our assembled library.
#AM_LDFLAGS = ${top_builddir}/src/clib/libpio.la
AM_CPPFLAGS = -I$(top_srcdir)/src/clib
LDADD = ${top_builddir}/src/clib/libpio.la
LDADD = ${top_builddir}/src/clib/libpioc.la

# Build the tests for make check.
check_PROGRAMS = test_intercomm2 test_async_mpi test_spmd \
Expand Down
4 changes: 2 additions & 2 deletions tests/cunit/test_async_mpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -430,8 +430,8 @@ int main(int argc, char **argv)
int ioroot = 0;
int msg = MSG_EXIT;

if (verbose)
printf("my_rank %d sending exit message on union_comm %d\n", my_rank, union_comm[cmp]);
/* if (verbose) */
/* printf("my_rank %d sending exit message on union_comm %d\n", my_rank, union_comm[cmp]); */
if ((mpierr = MPI_Send(&msg, 1, MPI_INT, ioroot, 1, union_comm[cmp])))
MPIERR(mpierr);
}
Expand Down
2 changes: 1 addition & 1 deletion tests/general/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ include $(top_srcdir)/set_flags.am

LDADD = libpio_tutil.la \
${top_builddir}/src/flib/libpiof.la \
${top_builddir}/src/clib/libpio.la
${top_builddir}/src/clib/libpioc.la

# There is a test utility mod file in this subdir which must be built.
SUBDIRS = util
Expand Down
2 changes: 1 addition & 1 deletion tests/performance/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ LDADD = $(top_builddir)/src/gptl/libperf_mod.la \
$(top_builddir)/src/gptl/libperf_utils.la \
${top_builddir}/tests/general/libpio_tutil.la \
${top_builddir}/src/flib/libpiof.la \
${top_builddir}/src/clib/libpio.la
${top_builddir}/src/clib/libpioc.la

# Find perf_mod and perf_util.
AM_CPPFLAGS += -I$(top_builddir)/src/gptl
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ include $(top_srcdir)/set_flags.am
check_PROGRAMS = pio_unit_test_driver
pio_unit_test_driver_SOURCES = driver.F90
pio_unit_test_driver_LDADD = libglobal_vars.la libncdf_tests.la \
libbasic_tests.la ${top_builddir}/src/flib/libpiof.la ${top_builddir}/src/clib/libpio.la
libbasic_tests.la ${top_builddir}/src/flib/libpiof.la ${top_builddir}/src/clib/libpioc.la

# Build these uninstalled convenience libraries.
noinst_LTLIBRARIES = libglobal_vars.la libncdf_tests.la \
Expand Down

0 comments on commit 1994cde

Please sign in to comment.