Skip to content

Commit f4bc7ea

Browse files
jacobwilliamsjacobwilliams
committed
some mods to the new VS unittest code.
Now it stops on the first error. updated for unit test 30.
1 parent 31fb6d3 commit f4bc7ea

File tree

4 files changed

+48
-72
lines changed

4 files changed

+48
-72
lines changed

‎src/tests/jf_test_30.f90

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ end subroutine test_30
6666
end module jf_test_30_mod
6767
!*****************************************************************************************
6868

69+
#ifndef INTERGATED_TESTS
6970
!*****************************************************************************************
7071
program jf_test_30
7172

@@ -80,3 +81,4 @@ program jf_test_30
8081

8182
end program jf_test_30
8283
!*****************************************************************************************
84+
#endif

‎visual_studio/jsonfortrantest/ReadMe.txt

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎visual_studio/jsonfortrantest/jsonfortrantest.f90

Lines changed: 45 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
1-
2-
!****************************************************************************
3-
!
4-
! PROGRAM: jsonfortrantest
5-
!
6-
! PURPOSE: Entry point for the console application.
7-
!
8-
! runs through all the tests in the tests folder returns 1 on shut down if there are any errors.
1+
!*****************************************************************************************
2+
!>
3+
! Entry point for the unified unit test application.
94
!
10-
!****************************************************************************
5+
! Runs through all the tests in the `tests` folder
6+
! Returns 1 if there are any errors.
117

12-
program jsonfortrantest
8+
program jsonfortrantest
139

1410
use jf_test_1_mod , only: test_1
1511
use jf_test_2_mod , only: test_2
@@ -29,7 +25,7 @@ program jsonfortrantest
2925
use jf_test_16_mod , only: test_16
3026
use jf_test_17_mod , only: test_17
3127
use jf_test_18_mod , only: test_18
32-
use jf_test_19_mod , only: test_19
28+
use jf_test_19_mod , only: test_19
3329
use jf_test_20_mod , only: test_20
3430
use jf_test_21_mod , only: test_21
3531
use jf_test_22_mod , only: test_22
@@ -38,43 +34,45 @@ program jsonfortrantest
3834
use jf_test_25_mod , only: test_25
3935
use jf_test_26_mod , only: test_26
4036
use jf_test_27_mod , only: test_27
41-
use jf_test_29_mod , only: test_29
42-
43-
37+
use jf_test_29_mod , only: test_29
38+
use jf_test_30_mod , only: test_30
39+
4440
implicit none
45-
integer :: n_errors
4641

47-
call test_1(n_errors)
48-
call test_2(n_errors)
49-
call test_3(n_errors)
50-
call test_4(n_errors)
51-
call test_5(n_errors)
52-
call test_6(n_errors)
53-
call test_7(n_errors)
54-
call test_8(n_errors)
55-
call test_9(n_errors)
56-
call test_10(n_errors)
57-
call test_11(n_errors)
58-
call test_12(n_errors)
59-
call test_13(n_errors)
60-
call test_14(n_errors)
61-
call test_15(n_errors)
62-
call test_16(n_errors)
63-
call test_17(n_errors)
64-
call test_18(n_errors)
65-
call test_19(n_errors)
66-
call test_20(n_errors)
67-
call test_21(n_errors)
68-
call test_22(n_errors)
69-
call test_23(n_errors)
70-
call test_24(n_errors)
71-
call test_25(n_errors)
72-
call test_26(n_errors)
73-
call test_27(n_errors)
74-
call test_29(n_errors)
75-
76-
if (n_errors /= 0) stop 1
77-
78-
end program jsonfortrantest
42+
integer :: n_errors !! number of errors
43+
44+
n_errors = 0
45+
46+
call test_1(n_errors); if (n_errors /= 0) stop 1
47+
call test_2(n_errors); if (n_errors /= 0) stop 1
48+
call test_3(n_errors); if (n_errors /= 0) stop 1
49+
call test_4(n_errors); if (n_errors /= 0) stop 1
50+
call test_5(n_errors); if (n_errors /= 0) stop 1
51+
call test_6(n_errors); if (n_errors /= 0) stop 1
52+
call test_7(n_errors); if (n_errors /= 0) stop 1
53+
call test_8(n_errors); if (n_errors /= 0) stop 1
54+
call test_9(n_errors); if (n_errors /= 0) stop 1
55+
call test_10(n_errors); if (n_errors /= 0) stop 1
56+
call test_11(n_errors); if (n_errors /= 0) stop 1
57+
call test_12(n_errors); if (n_errors /= 0) stop 1
58+
call test_13(n_errors); if (n_errors /= 0) stop 1
59+
call test_14(n_errors); if (n_errors /= 0) stop 1
60+
call test_15(n_errors); if (n_errors /= 0) stop 1
61+
call test_16(n_errors); if (n_errors /= 0) stop 1
62+
call test_17(n_errors); if (n_errors /= 0) stop 1
63+
call test_18(n_errors); if (n_errors /= 0) stop 1
64+
call test_19(n_errors); if (n_errors /= 0) stop 1
65+
call test_20(n_errors); if (n_errors /= 0) stop 1
66+
call test_21(n_errors); if (n_errors /= 0) stop 1
67+
call test_22(n_errors); if (n_errors /= 0) stop 1
68+
call test_23(n_errors); if (n_errors /= 0) stop 1
69+
call test_24(n_errors); if (n_errors /= 0) stop 1
70+
call test_25(n_errors); if (n_errors /= 0) stop 1
71+
call test_26(n_errors); if (n_errors /= 0) stop 1
72+
call test_27(n_errors); if (n_errors /= 0) stop 1
73+
call test_29(n_errors); if (n_errors /= 0) stop 1
74+
call test_30(n_errors); if (n_errors /= 0) stop 1
7975

76+
end program jsonfortrantest
77+
!*****************************************************************************************
8078

‎visual_studio/jsonfortrantest/jsonfortrantest.vfproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
<File RelativePath="..\..\src\tests\jf_test_26.f90"/>
4747
<File RelativePath="..\..\src\tests\jf_test_27.f90"/>
4848
<File RelativePath="..\..\src\tests\jf_test_29.f90"/>
49+
<File RelativePath="..\..\src\tests\jf_test_30.f90"/>
4950
<File RelativePath="..\..\src\tests\jf_test_3.f90"/>
5051
<File RelativePath="..\..\src\tests\jf_test_4.f90"/>
5152
<File RelativePath="..\..\src\tests\jf_test_5.f90"/>

0 commit comments

Comments
 (0)