From 4f5cf775f8a5ffe0fd7735ab1e7a62ca879fbc19 Mon Sep 17 00:00:00 2001 From: mlee03 Date: Fri, 19 Jul 2024 09:25:13 -0400 Subject: [PATCH] fix makefile.am for t_acc --- t_acc/test_get_grid_cell_struct/Makefile.am | 2 +- t_acc/test_get_interp_order1/Makefile.am | 2 +- t_acc/test_get_upbound_nxcells_2dx2d/Makefile.am | 2 +- t_acc/test_read_remap_file/Makefile.am | 4 +--- .../test_read_remap_file/test_read_remap_file_conserve.sh | 7 ++++--- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/t_acc/test_get_grid_cell_struct/Makefile.am b/t_acc/test_get_grid_cell_struct/Makefile.am index 30fb36e8..0c368d47 100644 --- a/t_acc/test_get_grid_cell_struct/Makefile.am +++ b/t_acc/test_get_grid_cell_struct/Makefile.am @@ -29,6 +29,6 @@ LDADD = $(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS) \ $(top_builddir)/tools/libfrencutils/libfrencutils.a \ $(top_builddir)/tools/libfrencutils_acc/libfrencutils_acc.a -test_get_grid_cell_struct = test_get_grid_cell_struct.c +test_get_grid_cell_struct_SOURCES = test_get_grid_cell_struct.c TESTS = test_get_grid_cell_struct diff --git a/t_acc/test_get_interp_order1/Makefile.am b/t_acc/test_get_interp_order1/Makefile.am index edd4df67..88b0f3e5 100644 --- a/t_acc/test_get_interp_order1/Makefile.am +++ b/t_acc/test_get_interp_order1/Makefile.am @@ -30,6 +30,6 @@ LDADD = $(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS) \ $(top_builddir)/tools/libfrencutils/libfrencutils.a \ $(top_builddir)/tools/libfrencutils_acc/libfrencutils_acc.a -test_get_upbound_nxcells_2dx2d = test_get_interp_order1.c +test_get_interp_order1_SOURCES = test_get_interp_order1.c TESTS = test_get_interp_order1 diff --git a/t_acc/test_get_upbound_nxcells_2dx2d/Makefile.am b/t_acc/test_get_upbound_nxcells_2dx2d/Makefile.am index 889c57c9..f361dffb 100644 --- a/t_acc/test_get_upbound_nxcells_2dx2d/Makefile.am +++ b/t_acc/test_get_upbound_nxcells_2dx2d/Makefile.am @@ -30,6 +30,6 @@ LDADD = $(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS) \ $(top_builddir)/tools/libfrencutils/libfrencutils.a \ $(top_builddir)/tools/libfrencutils_acc/libfrencutils_acc.a -test_get_upbound_nxcells_2dx2d = test_get_upbound_nxcells_2dx2d.c +test_get_upbound_nxcells_2dx2d_SOURCES = test_get_upbound_nxcells_2dx2d.c TESTS = test_get_upbound_nxcells_2dx2d diff --git a/t_acc/test_read_remap_file/Makefile.am b/t_acc/test_read_remap_file/Makefile.am index 760b3aae..d0646388 100644 --- a/t_acc/test_read_remap_file/Makefile.am +++ b/t_acc/test_read_remap_file/Makefile.am @@ -37,10 +37,8 @@ TESTS = test_read_remap_file_conserve.sh EXTRA_DIST = test_read_remap_file_conserve.sh \ test_make_remap_file.py -cp_test_make_remap_file : test_make_remap_file_conserve.py - cp $(top_srcdir)/t_acc/test_read_remap_file/test_make_remap_file_conserve.py \ - $(top_builddir)/t_acc/test_read_remap_file/test_make_remap_file_conserve.py +TESTS_ENVIRONMENT = test_make_remap_file_conserve="$(srcdir)/test_make_remap_file_conserve.py" TEST_EXTENSIONS = .sh diff --git a/t_acc/test_read_remap_file/test_read_remap_file_conserve.sh b/t_acc/test_read_remap_file/test_read_remap_file_conserve.sh index bc902063..e9ee82d2 100755 --- a/t_acc/test_read_remap_file/test_read_remap_file_conserve.sh +++ b/t_acc/test_read_remap_file/test_read_remap_file_conserve.sh @@ -19,12 +19,13 @@ #*********************************************************************** #copy python script over -make cp_test_make_remap_file +#make cp_test_make_remap_file echo -e "\ntest reading remap file for conserve_order1\n" -./test_make_remap_file_conserve.py 1 + +${test_make_remap_file_conserve} 1 ./test_read_remap_file 1 echo -e "\ntest reading remap file for conserve_order2\n" -./test_make_remap_file_conserve.py 2 +${test_make_remap_file_conserve} 2 ./test_read_remap_file 2