Skip to content

Commit a1b4aad

Browse files
committed
test_installed: add f77 test programs in test/testcases
1 parent 74bd79a commit a1b4aad

File tree

3 files changed

+33
-3
lines changed

3 files changed

+33
-3
lines changed

test/test_installed/batch.sh.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,11 @@
1111

1212
cd $PWD
1313

14+
# exit immediately when any of the runs failed
1415
set -e
1516

17+
export LD_LIBRARY_PATH=__PNETCDF_DIR__/lib:$LD_LIBRARY_PATH
18+
1619
OUT_DIR=__OUT_DIR__
1720

1821
NP=4

test/test_installed/interactive.sh.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
#!/bin/bash -l
22

3+
# exit immediately when any of the runs failed
34
set -e
45

6+
export LD_LIBRARY_PATH=__PNETCDF_DIR__/lib:$LD_LIBRARY_PATH
7+
58
OUT_DIR=__OUT_DIR__
69

710
NP=4

test/test_installed/makefile

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
.SUFFIXES: .o .exe77 .exe90 .77o .90o
2-
.PRECIOUS: %.o %.77o %.90o
1+
.SUFFIXES: .o .exe77 .exe90 .77o .90o .testcases77o
2+
.PRECIOUS: %.o %.77o %.90o %.testcases77o
33

44
CPPFLAGS = -I$(PNETCDF_DIR)/include -I../common
55
CFLAGS = $(CPPFLAGS)
@@ -41,7 +41,9 @@ testcases_src = ../testcases/add_var.c \
4141
../testcases/collective_error.c \
4242
../testcases/flexible.c \
4343
../testcases/flexible2.c \
44+
../testcases/flexible_var.c \
4445
../testcases/flexible_varm.c \
46+
../testcases/tst_grow_header.c \
4547
../testcases/inq_num_vars.c \
4648
../testcases/inq_recsize.c \
4749
../testcases/ivarn.c \
@@ -64,9 +66,12 @@ testcases_src = ../testcases/add_var.c \
6466
../testcases/test_vard_rec.c \
6567
../testcases/test_varm.c \
6668
../testcases/tst_def_var_fill.c \
69+
../testcases/tst_del_attr.c \
6770
../testcases/tst_dimsizes.c \
6871
../testcases/tst_free_comm.c \
6972
../testcases/tst_max_var_dims.c \
73+
../testcases/tst_redefine.c \
74+
../testcases/tst_symlink.c \
7075
../testcases/tst_version.c \
7176
../testcases/varn_contig.c \
7277
../testcases/varn_int.c \
@@ -84,6 +89,7 @@ examples_C_src = ../../examples/C/block_cyclic.c \
8489
../../examples/C/create_open.c \
8590
../../examples/C/fill_mode.c \
8691
../../examples/C/flexible_api.c \
92+
../../examples/C/flexible_bottom.c \
8793
../../examples/C/get_info.c \
8894
../../examples/C/ghost_cell.c \
8995
../../examples/C/global_attributes.c \
@@ -98,6 +104,7 @@ examples_C_src = ../../examples/C/block_cyclic.c \
98104
../../examples/C/time_var.c \
99105
../../examples/C/transpose2D.c \
100106
../../examples/C/transpose.c \
107+
../../examples/C/vard_bottom.c \
101108
../../examples/C/vard_int.c \
102109
../../examples/C/vard_mvars.c
103110
EXAMPLE_PROGS += $(examples_C_src:../../examples/C/%.c=%)
@@ -110,6 +117,16 @@ F90_src = ../F90/f90tst_parallel.f90 \
110117
../F90/f90tst_parallel4.f90
111118
TEST_PROGS += $(F90_src:../F90/%.f90=%.exe90)
112119

120+
testcases_F77_src = ../testcases/attrf.f \
121+
../testcases/buftype_freef.f \
122+
../testcases/flexible_api.f \
123+
../testcases/put_parameter.f \
124+
../testcases/varn_intf.f
125+
TEST_PROGS += $(testcases_F77_src:../testcases/%.f=%.exe77)
126+
127+
%.testcases77o: ../testcases/%.f
128+
$(FC) $(CPPFLAGS) $(FCFLAGS) -c $< -o $@
129+
113130
examples_F77_src = ../../examples/F77/block_cyclic.f \
114131
../../examples/F77/bput_varn_int8.f \
115132
../../examples/F77/column_wise.f \
@@ -161,6 +178,11 @@ f90tst_parallel4.exe90: ../F90/f90tst_parallel4.f90 testutilsf.o
161178
.77o.exe77:
162179
$(FC) $(CPPFLAGS) $(FCFLAGS) -o $@ $< utils.o $(LDFLAGS) -lpnetcdf
163180

181+
attrf.testcases77o: testutilsf.o
182+
183+
.testcases77o.exe77:
184+
$(FC) $(CPPFLAGS) $(FCFLAGS) -o $@ $< testutilsf.o $(LDFLAGS) -lpnetcdf
185+
164186
.90o.exe90:
165187
$(FC) $(CPPFLAGS) $(FCFLAGS) -o $@ $< utils.o $(LDFLAGS) -lpnetcdf
166188

@@ -200,13 +222,15 @@ interactive.sh: interactive.sh.in makefile
200222
@sed -i -e "s|__EXAMPLE_PROGS__|$(EXAMPLE_PROGS)|" $@
201223
@sed -i -e "s|__RUN_CMD__|$(RUN_CMD)|" $@
202224
@sed -i -e "s|__OUT_DIR__|$(OUT_DIR)|" $@
225+
@sed -i -e "s|__PNETCDF_DIR__|$(PNETCDF_DIR)|" $@
203226

204227
batch.sh: batch.sh.in makefile
205228
@sed -e "s|__TEST_PROGS__|$(TEST_PROGS)|" $< > $@
206229
@sed -i -e "s|__EXAMPLE_PROGS__|$(EXAMPLE_PROGS)|" $@
207230
@sed -i -e "s|__RUN_CMD__|$(RUN_CMD)|" $@
208231
@sed -i -e "s|__OUT_DIR__|$(OUT_DIR)|" $@
232+
@sed -i -e "s|__PNETCDF_DIR__|$(PNETCDF_DIR)|" $@
209233

210234
clean:
211-
rm -f *.o *.77o *.90o $(TEST_PROGS) $(EXAMPLE_PROGS) batch.sh interactive.sh
235+
rm -f *.o *.77o *.90o *.testcases77o $(TEST_PROGS) $(EXAMPLE_PROGS) batch.sh interactive.sh
212236

0 commit comments

Comments
 (0)