Skip to content

Commit 76f7cff

Browse files
amontoisonamontoison
authored
[Meson] Preprocess all Fortran files for the tests (#109)
1 parent ce960b0 commit 76f7cff

File tree

3 files changed

+40
-45
lines changed

3 files changed

+40
-45
lines changed

‎meson.build‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -247,24 +247,24 @@ if build_tests and static_compilation
247247
package = test[0]
248248
precision = test[1]
249249
name = test[2]
250-
file = tests_common_src + test[3]
250+
files_f90 = test[3]
251+
files_f = test[4]
251252

252253
if precision == 'single'
253254
libcutest_precision = libcutest_single
254-
fortran_args_precision = fc_flag + '-DREAL_32'
255+
pp_files_f90 = [gen_single.process(files_f90)]
255256
endif
256257
if precision == 'double'
257258
libcutest_precision = libcutest_double
258-
fortran_args_precision = fc_flag
259+
pp_files_f90 = [gen_double.process(files_f90)]
259260
endif
260261
if precision == 'quadruple'
261262
libcutest_precision = libcutest_quadruple
262-
fortran_args_precision = fc_flag + '-DREAL_128'
263+
pp_files_f90 = [gen_quadruple.process(files_f90)]
263264
endif
264265

265266
test(name,
266-
executable(name, file,
267-
fortran_args : fortran_args_precision,
267+
executable(name, pp_files_f90 + files_f,
268268
link_with : libcutest_precision,
269269
link_language : 'fortran',
270270
include_directories: libcutest_include,
@@ -285,27 +285,24 @@ if build_tests and (fc.get_id() == 'gcc') and static_compilation
285285
package = test[0]
286286
precision = test[1]
287287
name = test[2]
288-
file = test[3]
288+
files_c = test[3]
289+
files_f = test[4]
289290

290291
if precision == 'single'
291292
libcutest_precision = libcutest_single
292-
fortran_args_precision = fc_flag + '-DREAL_32'
293293
c_args_precision = cc_flag + '-DREAL_32'
294294
endif
295295
if precision == 'double'
296296
libcutest_precision = libcutest_double
297-
fortran_args_precision = fc_flag
298297
c_args_precision = cc_flag
299298
endif
300299
if precision == 'quadruple'
301300
libcutest_precision = libcutest_quadruple
302-
fortran_args_precision = fc_flag + '-DREAL_128'
303301
c_args_precision = cc_flag + '-DREAL_128'
304302
endif
305303

306304
test(name,
307-
executable(name, file,
308-
fortran_args : fortran_args_precision,
305+
executable(name, files_c + files_f,
309306
c_args : c_args_precision,
310307
link_with : libcutest_precision,
311308
link_language : 'fortran',

‎src/test/meson.build‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -10,37 +10,37 @@ c_quadruple = files('c_elfun_quadruple.f', 'c_group_quadruple.f', 'c_range_quadr
1010
u_quadruple = files('u_elfun_quadruple.f', 'u_group_quadruple.f', 'u_range_quadruple.f')
1111
q_quadruple = files('q_elfun_quadruple.f', 'q_group_quadruple.f', 'q_range_quadruple.f')
1212

13-
cutest_tests += [['cutest', 'single', 'ctest_single' , files('ctest.F90' ) + c_single],
14-
['cutest', 'single', 'ctest_threaded_single', files('ctest_threaded.F90') + c_single],
15-
['cutest', 'single', 'utest_single' , files('utest.F90' ) + u_single],
16-
['cutest', 'single', 'utest_threaded_single', files('utest_threaded.F90') + u_single],
17-
['cutest', 'single', 'lqp_test_single' , files('lqptest.F90' ) + q_single],
18-
19-
['cutest', 'double', 'ctest_double' , files('ctest.F90' ) + c_double],
20-
['cutest', 'double', 'ctest_threaded_double', files('ctest_threaded.F90') + c_double],
21-
['cutest', 'double', 'utest_double' , files('utest.F90' ) + u_double],
22-
['cutest', 'double', 'utest_threaded_double', files('utest_threaded.F90') + u_double],
23-
['cutest', 'double', 'lqp_test_double' , files('lqptest.F90' ) + q_double]]
24-
25-
cutest_c_tests += [['cutest', 'single', 'ctest_c_single' , files('ctest.c' ) + c_single],
26-
['cutest', 'single', 'utest_c_single' , files('utest.c' ) + u_single],
27-
['cutest', 'single', 'ctest2_c_single', files('ctest_c.c') + c_single],
28-
['cutest', 'single', 'utest2_c_single', files('utest_c.c') + u_single],
29-
30-
['cutest', 'double', 'ctest_c_double' , files('ctest.c' ) + c_double],
31-
['cutest', 'double', 'utest_c_double' , files('utest.c' ) + u_double],
32-
['cutest', 'double', 'ctest2_c_double', files('ctest_c.c') + c_double],
33-
['cutest', 'double', 'utest2_c_double', files('utest_c.c') + u_double]]
13+
cutest_tests += [['cutest', 'single', 'ctest_single' , files('ctest.F90' ), c_single],
14+
['cutest', 'single', 'ctest_threaded_single', files('ctest_threaded.F90'), c_single],
15+
['cutest', 'single', 'utest_single' , files('utest.F90' ), u_single],
16+
['cutest', 'single', 'utest_threaded_single', files('utest_threaded.F90'), u_single],
17+
['cutest', 'single', 'lqp_test_single' , files('lqptest.F90' ), q_single],
18+
19+
['cutest', 'double', 'ctest_double' , files('ctest.F90' ), c_double],
20+
['cutest', 'double', 'ctest_threaded_double', files('ctest_threaded.F90'), c_double],
21+
['cutest', 'double', 'utest_double' , files('utest.F90' ), u_double],
22+
['cutest', 'double', 'utest_threaded_double', files('utest_threaded.F90'), u_double],
23+
['cutest', 'double', 'lqp_test_double' , files('lqptest.F90' ), q_double]]
24+
25+
cutest_c_tests += [['cutest', 'single', 'ctest_c_single' , files('ctest.c' ), c_single],
26+
['cutest', 'single', 'utest_c_single' , files('utest.c' ), u_single],
27+
['cutest', 'single', 'ctest2_c_single', files('ctest_c.c'), c_single],
28+
['cutest', 'single', 'utest2_c_single', files('utest_c.c'), u_single],
29+
30+
['cutest', 'double', 'ctest_c_double' , files('ctest.c' ), c_double],
31+
['cutest', 'double', 'utest_c_double' , files('utest.c' ), u_double],
32+
['cutest', 'double', 'ctest2_c_double', files('ctest_c.c'), c_double],
33+
['cutest', 'double', 'utest2_c_double', files('utest_c.c'), u_double]]
3434

3535
if build_quadruple
36-
cutest_tests += [['cutest', 'quadruple', 'ctest_quadruple' , files('ctest.F90' ) + c_quadruple],
37-
['cutest', 'quadruple', 'ctest_threaded_quadruple', files('ctest_threaded.F90') + c_quadruple],
38-
['cutest', 'quadruple', 'utest_quadruple' , files('utest.F90' ) + u_quadruple],
39-
['cutest', 'quadruple', 'utest_threaded_quadruple', files('utest_threaded.F90') + u_quadruple],
40-
['cutest', 'quadruple', 'lqp_test_quadruple' , files('lqptest.F90' ) + q_quadruple]]
41-
42-
cutest_c_tests += [['cutest', 'quadruple', 'ctest_c_quadruple' , files('ctest.c' ) + c_quadruple],
43-
['cutest', 'quadruple', 'utest_c_quadruple' , files('utest.c' ) + u_quadruple],
44-
['cutest', 'quadruple', 'ctest2_c_quadruple', files('ctest_c.c') + c_quadruple],
45-
['cutest', 'quadruple', 'utest2_c_quadruple', files('utest_c.c') + u_quadruple]]
36+
cutest_tests += [['cutest', 'quadruple', 'ctest_quadruple' , files('ctest.F90' ), c_quadruple],
37+
['cutest', 'quadruple', 'ctest_threaded_quadruple', files('ctest_threaded.F90'), c_quadruple],
38+
['cutest', 'quadruple', 'utest_quadruple' , files('utest.F90' ), u_quadruple],
39+
['cutest', 'quadruple', 'utest_threaded_quadruple', files('utest_threaded.F90'), u_quadruple],
40+
['cutest', 'quadruple', 'lqp_test_quadruple' , files('lqptest.F90' ), q_quadruple]]
41+
42+
cutest_c_tests += [['cutest', 'quadruple', 'ctest_c_quadruple' , files('ctest.c' ), c_quadruple],
43+
['cutest', 'quadruple', 'utest_c_quadruple' , files('utest.c' ), u_quadruple],
44+
['cutest', 'quadruple', 'ctest2_c_quadruple', files('ctest_c.c'), c_quadruple],
45+
['cutest', 'quadruple', 'utest2_c_quadruple', files('utest_c.c'), u_quadruple]]
4646
endif

‎src/tools/meson.build‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,5 +96,3 @@ libcutest_src += files('ccf.F90',
9696
if get_option('default_library') == 'shared'
9797
libcutest_src += files('cutest_trampoline.f90')
9898
endif
99-
100-
tests_common_src = files('interface.F90')

0 commit comments

Comments
 (0)