working on fortran tests in autotools build

jedwards4b · Mar 25, 2019 · 654bcb7 · 654bcb7
1 parent dbaa196
commit 654bcb7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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