now generating F90 files in tests/general

configure.ac

@@ -125,26 +125,6 @@ AC_CONFIG_FILES(src/flib/piodarray.F90:src/flib/piodarray.F90.in2)
 AC_CONFIG_FILES(src/flib/pionfatt_mod.F90:src/flib/pionfatt_mod.F90.in2)
 AC_CONFIG_FILES(src/flib/pionfget_mod.F90:src/flib/pionfget_mod.F90.in2)
 AC_CONFIG_FILES(src/flib/pionfput_mod.F90:src/flib/pionfput_mod.F90.in2)
-AC_CONFIG_FILES(tests/general/ncdf_fail.F90:tests/general/ncdf_fail.F90.in2)
-AC_CONFIG_FILES(tests/general/ncdf_get_put.F90:tests/general/ncdf_get_put.F90.in2)
-AC_CONFIG_FILES(tests/general/ncdf_inq.F90:tests/general/ncdf_inq.F90.in2)
-AC_CONFIG_FILES(tests/general/ncdf_simple_tests.F90:tests/general/ncdf_simple_tests.F90.in2)
-AC_CONFIG_FILES(tests/general/pio_decomp_fillval.F90:tests/general/pio_decomp_fillval.F90.in2)
-AC_CONFIG_FILES(tests/general/pio_decomp_frame_tests.F90:tests/general/pio_decomp_frame_tests.F90.in2)
-AC_CONFIG_FILES(tests/general/pio_decomp_tests_1d.F90:tests/general/pio_decomp_tests_1d.F90.in2)
-AC_CONFIG_FILES(tests/general/pio_decomp_tests_2d.F90:tests/general/pio_decomp_tests_2d.F90.in2)
-AC_CONFIG_FILES(tests/general/pio_decomp_tests_3d.F90:tests/general/pio_decomp_tests_3d.F90.in2)
-AC_CONFIG_FILES(tests/general/pio_decomp_tests.F90:tests/general/pio_decomp_tests.F90.in2)
-AC_CONFIG_FILES(tests/general/pio_file_fail.F90:tests/general/pio_file_fail.F90.in2)
-AC_CONFIG_FILES(tests/general/pio_file_simple_tests.F90:tests/general/pio_file_simple_tests.F90.in2)
-AC_CONFIG_FILES(tests/general/pio_init_finalize.F90:tests/general/pio_init_finalize.F90.in2)
-AC_CONFIG_FILES(tests/general/pio_iosystem_tests2.F90:tests/general/pio_iosystem_tests2.F90.in2)
-AC_CONFIG_FILES(tests/general/pio_iosystem_tests3.F90:tests/general/pio_iosystem_tests3.F90.in2)
-AC_CONFIG_FILES(tests/general/pio_iosystem_tests.F90:tests/general/pio_iosystem_tests.F90.in2)
-AC_CONFIG_FILES(tests/general/pio_rearr.F90:tests/general/pio_rearr.F90.in2)
-AC_CONFIG_FILES(tests/general/pio_rearr_opts2.F90:tests/general/pio_rearr_opts2.F90.in2)
-AC_CONFIG_FILES(tests/general/pio_rearr_opts.F90:tests/general/pio_rearr_opts.F90.in2)
-AC_CONFIG_FILES(tests/general/pio_tutil.F90:tests/general/util/pio_tutil.F90)
 
 AC_CONFIG_LINKS([tests/unit/input.nl:tests/unit/input.nl])
 

tests/general/Makefile.am

@@ -63,16 +63,31 @@ pio_iosystem_tests3_SOURCES = pio_iosystem_tests3.F90
 # Tests will run from a bash script.
 TESTS = run_tests.sh
 
+%.F90: %.F90.in
+	util/pio_tf_f90gen.pl --annotate-source --out=$@ $<
+
+ncdf_fail.F90: ncdf_fail.F90.in
+ncdf_get_put.F90: ncdf_get_put.F90.in
+ncdf_inq.F90: ncdf_inq.F90.in
+ncdf_simple_tests.F90:ncdf_simple_tests.F90.in
+pio_decomp_fillval.F90:pio_decomp_fillval.F90.in
+pio_decomp_frame_tests.F90:pio_decomp_frame_tests.F90.in
+pio_decomp_tests_1d.F90:pio_decomp_tests_1d.F90.in
+pio_decomp_tests_2d.F90:pio_decomp_tests_2d.F90.in
+pio_decomp_tests_3d.F90:pio_decomp_tests_3d.F90.in
+pio_decomp_tests.F90:pio_decomp_tests.F90.in
+pio_file_fail.F90:pio_file_fail.F90.in
+pio_file_simple_tests.F90:pio_file_simple_tests.F90.in
+pio_init_finalize.F90:pio_init_finalize.F90.in
+pio_iosystem_tests2.F90:pio_iosystem_tests2.F90.in
+pio_iosystem_tests3.F90:pio_iosystem_tests3.F90.in
+pio_iosystem_tests.F90:pio_iosystem_tests.F90.in
+pio_rearr.F90:pio_rearr.F90.in
+pio_rearr_opts2.F90:pio_rearr_opts2.F90.in
+pio_rearr_opts.F90:pio_rearr_opts.F90.in
+
 # Distribute the test script.
-EXTRA_DIST = CMakeLists.txt run_tests.sh ncdf_fail.F90.in2		\
-ncdf_get_put.F90.in2 ncdf_inq.F90.in2 ncdf_simple_tests.F90.in2		\
-pio_decomp_fillval.F90.in2 pio_decomp_frame_tests.F90.in2		\
-pio_decomp_tests_1d.F90.in2 pio_decomp_tests_2d.F90.in2			\
-pio_decomp_tests_3d.F90.in2 pio_decomp_tests.F90.in2			\
-pio_file_fail.F90.in2 pio_file_simple_tests.F90.in2			\
-pio_init_finalize.F90.in2 pio_iosystem_tests2.F90.in2			\
-pio_iosystem_tests3.F90.in2 pio_iosystem_tests.F90.in2			\
-pio_rearr.F90.in2 pio_rearr_opts2.F90.in2 pio_rearr_opts.F90.in2
+EXTRA_DIST = CMakeLists.txt run_tests.sh
 
 # Clean up files produced during testing.
 CLEANFILES = *.nc *.log *.mod