Skip to content

Commit 99d8944

Browse files
Applied some fixes and improvements
* more extensive warnings when building Fortran code * file names of the fortran tests reflect now the test program which produced them Update #409
1 parent 8013516 commit 99d8944

6 files changed

Lines changed: 12 additions & 6 deletions

File tree

CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,9 @@ message(STATUS "Link with: ${NAPI_LINK_LIBS}")
188188
#------------------------------------------------------------------------------
189189
if(ENABLE_FORTRAN90 OR ENABLE_FORTRAN77)
190190
enable_language(Fortran)
191+
192+
set(CMAKE_Fortran_FLAGS ${CMAKE_Fortran_FLAGS} "-Wall -fbacktrace -pedantic -fcheck=all -Wextra")
193+
message(STATUS ${CMAKE_Fortran_FLAGS})
191194
endif()
192195

193196
#-----------------------------------------------------------------------------

cmake_include/CompilerChecks.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,5 @@ if (UNIX)
8686
check_add_cxx_compiler_flags("-Wall -Wno-unused-variable "
8787
"-Wno-sign-compare -Wno-comment")
8888
endif(ENABLE_CXX)
89+
8990
endif(UNIX)

test/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ if(WITH_HDF5)
4444
add_executable(napi_test_hdf5 napi_test.c)
4545
target_link_libraries(napi_test_hdf5 NeXus_Shared_Library)
4646
add_test(NAME "NAPI-C-HDF5-test" COMMAND napi_test_hdf5)
47+
4748
add_executable(napi_attra_test_hdf5 napi_attra_test.c)
4849
target_link_libraries(napi_attra_test_hdf5 NeXus_Shared_Library)
4950
add_test(NAME "NAPI-C-HDF5-attra-test" COMMAND napi_attra_test_hdf5)
@@ -54,6 +55,7 @@ if(WITH_HDF4)
5455
target_link_libraries(napi_test_hdf4 NeXus_Shared_Library)
5556
add_test(NAME "NAPI-C-HDF4-test"
5657
COMMAND napi_test_hdf4)
58+
5759
add_executable(napi_attra_test_hdf4 napi_attra_test.c)
5860
target_link_libraries(napi_attra_test_hdf4 NeXus_Shared_Library)
5961
add_test(NAME "NAPI-C-HDF4-attra-test" COMMAND napi_attra_test_hdf4)

test/napif4_test.f

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
DATA U_BUFFER /0,1,2,3,4,5,6/
6363
EQUIVALENCE (CHAR_BUFFER, CHAR_BUFFER_B)
6464

65-
IF (NXOPEN('NXtest.nxs', NXACC_CREATE, FILEID) .NE. NX_OK) STOP
65+
IF (NXOPEN('napif4.nxs', NXACC_CREATE, FILEID) .NE. NX_OK) STOP
6666
IF (NXMAKEGROUP(FILEID, 'entry', 'NXentry') .NE. NX_OK) STOP
6767
IF (NXOPENGROUP(FILEID, 'entry', 'NXentry') .NE. NX_OK) STOP
6868
IF (NXMAKEDATA(FILEID, 'ch_data', NX_CHAR, 1, 10) .NE. NX_OK)
@@ -160,7 +160,7 @@
160160
IF (NXCLOSEGROUP(FILEID) .NE. NX_OK) STOP
161161
IF (NXCLOSE(FILEID) .NE. NX_OK) STOP
162162
C *** read data
163-
IF (NXOPEN('NXtest.nxs', NXACC_READ, FILEID) .NE. NX_OK) STOP
163+
IF (NXOPEN('napif4.nxs', NXACC_READ, FILEID) .NE. NX_OK) STOP
164164
IF (NXGETATTRINFO(FILEID, J) .NE. NX_OK) STOP
165165
IF (J .GT. 0) WRITE(*,'(1X,A,I2)')
166166
+ 'Number of global attributes: ', J

test/napif5_test.f

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
DATA U_BUFFER /0,1,2,3,4,5,6/
6464
EQUIVALENCE (CHAR_BUFFER, CHAR_BUFFER_B)
6565

66-
IF (NXOPEN('NXtest.nxs', NXACC_CREATE5, FILEID) .NE. NX_OK) STOP
66+
IF (NXOPEN('napif5.nxs', NXACC_CREATE5, FILEID) .NE. NX_OK) STOP
6767
IF (NXMAKEGROUP(FILEID, 'entry', 'NXentry') .NE. NX_OK) STOP
6868
IF (NXOPENGROUP(FILEID, 'entry', 'NXentry') .NE. NX_OK) STOP
6969
IF (NXMAKEDATA(FILEID, 'ch_data', NX_CHAR, 1, 10) .NE. NX_OK)
@@ -161,7 +161,7 @@
161161
IF (NXCLOSEGROUP(FILEID) .NE. NX_OK) STOP
162162
IF (NXCLOSE(FILEID) .NE. NX_OK) STOP
163163
C *** read data
164-
IF (NXOPEN('NXtest.nxs', NXACC_READ, FILEID) .NE. NX_OK) STOP
164+
IF (NXOPEN('napif5.nxs', NXACC_READ, FILEID) .NE. NX_OK) STOP
165165
IF (NXGETATTRINFO(FILEID, J) .NE. NX_OK) STOP
166166
IF (J .GT. 0) WRITE(*,'(1X,A,I2)')
167167
+ 'Number of global attributes: ', J

test/napif_test.f

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
DATA U_BUFFER /0,1,2,3,4,5,6/
6464
EQUIVALENCE (CHAR_BUFFER, CHAR_BUFFER_B)
6565

66-
IF (NXOPEN('NXtest.nxs', NXACC_CREATEXML, FILEID) .NE. NX_OK) STOP
66+
IF (NXOPEN('napif.nxs', NXACC_CREATEXML, FILEID) .NE. NX_OK) STOP
6767
IF (NXMAKEGROUP(FILEID, 'entry', 'NXentry') .NE. NX_OK) STOP
6868
IF (NXOPENGROUP(FILEID, 'entry', 'NXentry') .NE. NX_OK) STOP
6969
IF (NXMAKEDATA(FILEID, 'ch_data', NX_CHAR, 1, 10) .NE. NX_OK)
@@ -160,7 +160,7 @@
160160
IF (NXCLOSEGROUP(FILEID) .NE. NX_OK) STOP
161161
IF (NXCLOSE(FILEID) .NE. NX_OK) STOP
162162
C *** read data
163-
IF (NXOPEN('NXtest.nxs', NXACC_READ, FILEID) .NE. NX_OK) STOP
163+
IF (NXOPEN('napif.nxs', NXACC_READ, FILEID) .NE. NX_OK) STOP
164164
IF (NXGETATTRINFO(FILEID, J) .NE. NX_OK) STOP
165165
IF (J .GT. 0) WRITE(*,'(1X,A,I2)')
166166
+ 'Number of global attributes: ', J

0 commit comments

Comments
 (0)