From 654bcb74bb96766e19816db2ef6f54483803cebf Mon Sep 17 00:00:00 2001 From: Ed Hartnett Date: Mon, 25 Mar 2019 11:02:32 -0600 Subject: [PATCH] working on fortran tests in autotools build --- set_flags.am | 3 --- tests/general/Makefile.am | 14 ++++++++++---- tests/general/run_tests.sh | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/set_flags.am b/set_flags.am index f914680637f..b8cc1237059 100644 --- a/set_flags.am +++ b/set_flags.am @@ -7,6 +7,3 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/flib AM_CPPFLAGS += "-D_NETCDF -D_NETCDF4 -D_PETCDF" -# Link to our assembled libraries, C and Fortran. -AM_LDFLAGS = ${top_builddir}/src/clib/libpio.la -LDADD = ${top_builddir}/src/clib/libpiof.la diff --git a/tests/general/Makefile.am b/tests/general/Makefile.am index defa2e13896..ebda0cd501f 100644 --- a/tests/general/Makefile.am +++ b/tests/general/Makefile.am @@ -6,16 +6,22 @@ # Put together AM_CPPFLAGS and AM_LDFLAGS. include $(top_srcdir)/set_flags.am +LDADD = util/libpio_tutil.la \ +${top_builddir}/src/flib/libpiof.la \ +${top_builddir}/src/clib/libpio.la + AM_CPPFLAGS += -I${top_builddir}/tests/general/util SRCDIRS = util # Build the test for make check. -check_PROGRAMS = pio_init_finalize +check_PROGRAMS = pio_init_finalize #pio_file_simple_tests pio_init_finalize_SOURCES = pio_init_finalize.F90 -pio_init_finalize_LDADD = util/libpio_tutil.la \ -${top_builddir}/src/flib/libpiof.la \ -${top_builddir}/src/clib/libpio.la +# pio_init_finalize_LDADD = util/libpio_tutil.la \ +# ${top_builddir}/src/flib/libpiof.la \ +# ${top_builddir}/src/clib/libpio.la + + # Tests will run from a bash script. TESTS = run_tests.sh diff --git a/tests/general/run_tests.sh b/tests/general/run_tests.sh index 436a8b264a3..c684a9f64b5 100755 --- a/tests/general/run_tests.sh +++ b/tests/general/run_tests.sh @@ -10,7 +10,7 @@ trap exit INT TERM printf 'running PIO tests...\n' -PIO_TESTS='pio_init_finalize' +PIO_TESTS='pio_init_finalize pio_file_simple_tests' success1=true for TEST in $PIO_TESTS