Skip to content

Commit 6b6d84b

Browse files
committed
Allow test to have .F90 suffix
(Indicates preprocessing required)
1 parent a99966c commit 6b6d84b

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

SConstruct

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ obj = []
3434
exe = []
3535
here = os.getcwd()
3636
os.chdir(join('src', 'tests'))
37-
for f in sorted(glob.glob("*")):
38-
if not f.endswith('f90'): continue
37+
for f in sorted(glob.glob("*.[fF]90")):
3938
tests.append(join('src', 'tests', f))
4039
e = f[:-4]
4140
obj.append(join('src','tests',e+env['OBJSUFFIX']))

build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,10 +232,10 @@ if [[ $JF_SKIP_TESTS != [yY]* ]]; then
232232
# FoBiS.py PR #45 work around
233233
[ -d "$BINDIR" ] || mkdir "$BINDIR"
234234

235-
for TEST in "${TESTDIR%/}"/jf_test_*.f90; do
235+
for TEST in "${TESTDIR%/}"/jf_test_*.[fF]90; do
236236
THIS_TEST=${TEST##*/}
237-
echo "Build ${THIS_TEST%.f90}"
238-
FoBiS.py build -ch -compiler ${FCOMPILER} ${CUSTOM} -cflags "${FCOMPILERFLAGS} ${DEFINES}" ${COVERAGE} ${PROFILING} -dbld ${BINDIR} -s ${TESTDIR} -i ${LIBDIR} -libs ${LIBDIR}/${LIBOUT} -dmod ./ -dobj ./ -t ${THIS_TEST} -o ${THIS_TEST%.f90} -colors
237+
echo "Build ${THIS_TEST%.[fF]90}"
238+
FoBiS.py build -ch -compiler ${FCOMPILER} ${CUSTOM} -cflags "${FCOMPILERFLAGS} ${DEFINES}" ${COVERAGE} ${PROFILING} -dbld ${BINDIR} -s ${TESTDIR} -i ${LIBDIR} -libs ${LIBDIR}/${LIBOUT} -dmod ./ -dobj ./ -t ${THIS_TEST} -o ${THIS_TEST%.[fF]90} -colors
239239
done
240240
else
241241
echo "Skip building the unit tests since \$JF_SKIP_TESTS has been set to 'true'."

0 commit comments

Comments
 (0)