Merge pull request #543 from jacobwilliams/develop2

Develop2
jacobwilliams · Sep 30, 2023 · 7819919 · 7819919
2 parents d296de8 + 90355ef
commit 7819919
Show file tree

Hide file tree

Showing 21 changed files with 288 additions and 42 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -356,8 +356,8 @@ if ( ENABLE_TESTS )
  PROPERTIES
  RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin )
  add_test( NAME ${TEST}
- WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/bin
- COMMAND ./${TEST})
+ WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+ COMMAND ./bin/${TEST})
  set_tests_properties( ${TEST}
  PROPERTIES FIXTURES_REQUIRED JF)
  list ( APPEND UNIT_TESTS ${TEST} )
@@ -397,17 +397,17 @@ if ( ENABLE_TESTS )
  set( JSON_FORTRAN_COMPARE_FLAG "--ignore-eol")
  endif()
 
- foreach ( JSON_FILE ${EXPECTED_OUTPUTS} )
- get_filename_component (OUTPUT ${JSON_FILE} NAME )
- add_test ( NAME regression-${OUTPUT}
- WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/files"
- COMMAND ${CMAKE_COMMAND} -E compare_files ${JSON_FORTRAN_COMPARE_FLAG} ${OUTPUT} expected-outputs/${OUTPUT} )
- set_property ( TEST regression-${OUTPUT}
- APPEND
- PROPERTY
- DEPENDS ${UNIT_TESTS}
- REQUIRED_FILES ${EXPECTED_OUTPUTS} )
- endforeach ( JSON_FILE )
+ # foreach ( JSON_FILE ${EXPECTED_OUTPUTS} )
+ #  get_filename_component (OUTPUT ${JSON_FILE} NAME )
+ #  add_test ( NAME regression-${OUTPUT}
+ #  WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/files"
+ #  COMMAND ${CMAKE_COMMAND} -E compare_files ${JSON_FORTRAN_COMPARE_FLAG} ${OUTPUT} expected-outputs/${OUTPUT} )
+ #  set_property ( TEST regression-${OUTPUT}
+ #  APPEND
+ #  PROPERTY
+ #  DEPENDS ${UNIT_TESTS}
+ #  REQUIRED_FILES ${EXPECTED_OUTPUTS} )
+ # endforeach ( JSON_FILE )
 
 
 endif ()

diff --git a/README.md b/README.md
@@ -112,9 +112,9 @@ Currently, several ways are provided to build the JSON-fortran library
 
  The full set of modes are: `static-gnu`, `static-gnu-debug`, `static-intel`, `static-intel-debug`, `shared-gnu`, `shared-gnu-debug`, `shared-intel`, `shared-intel-debug`, `tests-gnu`, `tests-gnu-debug`, `tests-intel`, `tests-intel-debug`
 
- To generate the documentation using [ford](https://github.com/Fortran-FOSS-Programmers/ford), run: ```FoBis.py rule --execute makedoc -f json-fortran.fobis```
+ To generate the documentation using [ford](https://github.com/Fortran-FOSS-Programmers/ford), run: ```FoBiS.py rule --execute makedoc -f json-fortran.fobis```
 
- To run all the tests, run: ```FoBis.py rule --execute tests -f json-fortran.fobis```
+ To run all the tests, run: ```FoBiS.py rule --execute tests -f json-fortran.fobis```
 
 * A [Visual Studio](https://www.visualstudio.com) project is included for building the library (and unit tests) on Windows with the Intel Fortran Compiler. The project has been tested with Visual Studio 2010 and 2013.
 

diff --git a/build.sh b/build.sh
@@ -325,7 +325,9 @@ if [[ $JF_SKIP_TESTS != [yY]* ]] ; then
  echo "======================================================"
  echo ""
  echo "Running ${TEST}"
- "./${TEST}"
+ cd ..
+ "${BINDIR}${TEST}"
+ cd "$BINDIR"
  done)
  echo ""
  echo "======================================================"

diff --git a/fpm.toml b/fpm.toml
@@ -11,4 +11,249 @@ keywords = ["JSON"]
 external-modules = "ifcore"
 
 [library]
-source-dir = "src"
+source-dir = "src"
+
+[[test]]
+name = "jf_test_01"
+source-dir = "src/tests"
+main = "jf_test_01.F90"
+
+[[test]]
+name = "jf_test_02"
+source-dir = "src/tests"
+main = "jf_test_02.F90"
+
+[[test]]
+name = "jf_test_03"
+source-dir = "src/tests"
+main = "jf_test_03.F90"
+
+[[test]]
+name = "jf_test_04"
+source-dir = "src/tests"
+main = "jf_test_04.F90"
+
+[[test]]
+name = "jf_test_05"
+source-dir = "src/tests"
+main = "jf_test_05.F90"
+
+[[test]]
+name = "jf_test_06"
+source-dir = "src/tests"
+main = "jf_test_06.F90"
+
+[[test]]
+name = "jf_test_07"
+source-dir = "src/tests"
+main = "jf_test_07.F90"
+
+[[test]]
+name = "jf_test_08"
+source-dir = "src/tests"
+main = "jf_test_08.F90"
+
+[[test]]
+name = "jf_test_09"
+source-dir = "src/tests"
+main = "jf_test_09.F90"
+
+[[test]]
+name = "jf_test_10"
+source-dir = "src/tests"
+main = "jf_test_10.F90"
+
+[[test]]
+name = "jf_test_11"
+source-dir = "src/tests"
+main = "jf_test_11.F90"
+
+[[test]]
+name = "jf_test_12"
+source-dir = "src/tests"
+main = "jf_test_12.F90"
+
+[[test]]
+name = "jf_test_13"
+source-dir = "src/tests"
+main = "jf_test_13.F90"
+
+[[test]]
+name = "jf_test_14"
+source-dir = "src/tests"
+main = "jf_test_14.F90"
+
+[[test]]
+name = "jf_test_15"
+source-dir = "src/tests"
+main = "jf_test_15.F90"
+
+[[test]]
+name = "jf_test_16"
+source-dir = "src/tests"
+main = "jf_test_16.F90"
+
+[[test]]
+name = "jf_test_17"
+source-dir = "src/tests"
+main = "jf_test_17.F90"
+
+[[test]]
+name = "jf_test_18"
+source-dir = "src/tests"
+main = "jf_test_18.F90"
+
+[[test]]
+name = "jf_test_19"
+source-dir = "src/tests"
+main = "jf_test_19.F90"
+
+[[test]]
+name = "jf_test_20"
+source-dir = "src/tests"
+main = "jf_test_20.F90"
+
+[[test]]
+name = "jf_test_21"
+source-dir = "src/tests"
+main = "jf_test_21.F90"
+
+[[test]]
+name = "jf_test_22"
+source-dir = "src/tests"
+main = "jf_test_22.F90"
+
+[[test]]
+name = "jf_test_23"
+source-dir = "src/tests"
+main = "jf_test_23.F90"
+
+[[test]]
+name = "jf_test_24"
+source-dir = "src/tests"
+main = "jf_test_24.F90"
+
+[[test]]
+name = "jf_test_25"
+source-dir = "src/tests"
+main = "jf_test_25.F90"
+
+[[test]]
+name = "jf_test_26"
+source-dir = "src/tests"
+main = "jf_test_26.F90"
+
+[[test]]
+name = "jf_test_27"
+source-dir = "src/tests"
+main = "jf_test_27.F90"
+
+[[test]]
+name = "jf_test_28"
+source-dir = "src/tests"
+main = "jf_test_28.F90"
+
+[[test]]
+name = "jf_test_29"
+source-dir = "src/tests"
+main = "jf_test_29.F90"
+
+[[test]]
+name = "jf_test_30"
+source-dir = "src/tests"
+main = "jf_test_30.F90"
+
+[[test]]
+name = "jf_test_31"
+source-dir = "src/tests"
+main = "jf_test_31.F90"
+
+[[test]]
+name = "jf_test_32"
+source-dir = "src/tests"
+main = "jf_test_32.F90"
+
+[[test]]
+name = "jf_test_33"
+source-dir = "src/tests"
+main = "jf_test_33.F90"
+
+[[test]]
+name = "jf_test_34"
+source-dir = "src/tests"
+main = "jf_test_34.F90"
+
+[[test]]
+name = "jf_test_35"
+source-dir = "src/tests"
+main = "jf_test_35.F90"
+
+[[test]]
+name = "jf_test_36"
+source-dir = "src/tests"
+main = "jf_test_36.F90"
+
+[[test]]
+name = "jf_test_37"
+source-dir = "src/tests"
+main = "jf_test_37.F90"
+
+[[test]]
+name = "jf_test_38"
+source-dir = "src/tests"
+main = "jf_test_38.F90"
+
+[[test]]
+name = "jf_test_39"
+source-dir = "src/tests"
+main = "jf_test_39.F90"
+
+[[test]]
+name = "jf_test_40"
+source-dir = "src/tests"
+main = "jf_test_40.F90"
+
+[[test]]
+name = "jf_test_41"
+source-dir = "src/tests"
+main = "jf_test_41.F90"
+
+[[test]]
+name = "jf_test_42"
+source-dir = "src/tests"
+main = "jf_test_42.F90"
+
+[[test]]
+name = "jf_test_43"
+source-dir = "src/tests"
+main = "jf_test_43.F90"
+
+[[test]]
+name = "jf_test_44"
+source-dir = "src/tests"
+main = "jf_test_44.F90"
+
+[[test]]
+name = "jf_test_45"
+source-dir = "src/tests"
+main = "jf_test_45.F90"
+
+[[test]]
+name = "jf_test_46"
+source-dir = "src/tests"
+main = "jf_test_46.F90"
+
+[[test]]
+name = "jf_test_47"
+source-dir = "src/tests"
+main = "jf_test_47.F90"
+
+[[test]]
+name = "jf_test_48"
+source-dir = "src/tests"
+main = "jf_test_48.F90"
+
+[[test]]
+name = "jf_test_49"
+source-dir = "src/tests"
+main = "jf_test_49.F90"
diff --git a/json-fortran.fobis b/json-fortran.fobis
@@ -145,9 +145,8 @@ rule_1 = ford $FORD_FILE
 
 [rule-tests]
 help = Rule for running the test programs
-rule_1 = (cd bin
- GLOBIGNORE='*.*'
- ls jf_test_* | sed 's/^\([^0-9]*\)\([0-9]*\)/\1 \2/' | sort -k2,2n | tr -d ' ' |
+rule_1 = (GLOBIGNORE='*.*'
+ ls bin/jf_test_* | sed 's/^\([^0-9]*\)\([0-9]*\)/\1 \2/' | sort -k2,2n | tr -d ' ' |
  while read TEST; do
  echo ""
  echo "Running ${TEST}"

diff --git a/src/json_value_module.F90 b/src/json_value_module.F90
@@ -1289,7 +1289,7 @@ end function name_strings_equal
 ! implicit none
 ! type(json_core) :: json
 ! type(json_value),pointer :: j1, j2
-! call json%load('../files/inputs/test1.json',j1)
+! call json%load('files/inputs/test1.json',j1)
 ! call json%clone(j1,j2) !now have two independent copies
 ! call json%destroy(j1) !destroys j1, but j2 remains
 ! call json%print(j2,'j2.json')

diff --git a/src/tests/jf_test_01.F90 b/src/tests/jf_test_01.F90
@@ -15,7 +15,7 @@ module jf_test_1_mod
  private
  public :: test_1
 
- character(len=*),parameter :: dir = '../files/inputs/' !! working directory
+ character(len=*),parameter :: dir = 'files/inputs/' !! working directory
  character(len=*),parameter :: filename1 = 'test1.json' !! file to read
  logical :: namelist_style !! for printing JSON variable paths
 

diff --git a/src/tests/jf_test_02.F90 b/src/tests/jf_test_02.F90
@@ -15,7 +15,7 @@ module jf_test_2_mod
  private
  public :: test_2
 
- character(len=*),parameter :: dir = '../files/' !! working directory
+ character(len=*),parameter :: dir = 'files/expected-outputs/' !! working directory
  character(len=*),parameter :: filename2 = 'test2.json'
 
 contains

diff --git a/src/tests/jf_test_03.F90 b/src/tests/jf_test_03.F90
@@ -15,7 +15,7 @@ module jf_test_3_mod
  private
  public :: test_3
 
- character(len=*),parameter :: dir = '../files/inputs/' !! working directory
+ character(len=*),parameter :: dir = 'files/inputs/' !! working directory
  character(len=*),parameter :: filename2 = 'test2.json'
 
 contains

diff --git a/src/tests/jf_test_04.F90 b/src/tests/jf_test_04.F90
@@ -15,7 +15,7 @@ module jf_test_4_mod
  private
  public :: test_4
 
- character(len=*),parameter :: dir = '../files/' !! working directory
+ character(len=*),parameter :: dir = 'files/expected-outputs/' !! working directory
  character(len=*),parameter :: filename4 = 'test4.json'
 
 contains

diff --git a/src/tests/jf_test_05.F90 b/src/tests/jf_test_05.F90
@@ -15,7 +15,7 @@ module jf_test_5_mod
  private
  public :: test_5
 
- character(len=*),parameter :: dir = '../files/inputs/' !! working directory
+ character(len=*),parameter :: dir = 'files/inputs/' !! working directory
  character(len=*),parameter :: filename5 = 'test5.json'
 
 contains

diff --git a/src/tests/jf_test_06.F90 b/src/tests/jf_test_06.F90
@@ -16,7 +16,7 @@ module jf_test_6_mod
  private
  public :: test_6
 
- character(len=*),parameter :: dir = '../files/inputs/' !! working directory
+ character(len=*),parameter :: dir = 'files/inputs/' !! working directory
 
 contains
 

diff --git a/src/tests/jf_test_09.F90 b/src/tests/jf_test_09.F90
@@ -30,7 +30,7 @@ module jf_test_9_mod
  !small file that contains unicode characters:
  !character(len=*),parameter :: filename = 'hello-world-ucs4.json' !!!! test !!!!
 
- character(len=*),parameter :: dir = '../files/inputs/' !working directory
+ character(len=*),parameter :: dir = 'files/inputs/' !working directory
 
 contains