Skip to content

Commit 31fb6d3

Browse files
jacobwilliamsjacobwilliams
committed
Merge branch 'Visual_studio_integrated_tests' of https://github.com/Hugh-walsh/json-fortran into devel
2 parents 9a15565 + 2ac6af0 commit 31fb6d3

33 files changed

+240
-4
lines changed

‎.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,9 @@ visual_studio/*.u2d
1616
visual_studio/Debug/
1717
visual_studio/Release/
1818
visual_studio/x64/
19+
visual_studio/.vs/
20+
visual_studio/jsonfortranlib/
21+
22+
visual_studio/jsonfortrantest/Debug/
23+
*.u2d
24+
*.user

‎src/tests/jf_test_1.f90

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,7 @@ end subroutine print_json_variable
488488
end module jf_test_1_mod
489489
!*****************************************************************************************
490490

491+
#ifndef INTERGATED_TESTS
491492
!*****************************************************************************************
492493
program jf_test_1
493494

@@ -502,3 +503,4 @@ program jf_test_1
502503

503504
end program jf_test_1
504505
!*****************************************************************************************
506+
#endif

‎src/tests/jf_test_10.f90

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,7 @@ end subroutine test_10
334334
end module jf_test_10_mod
335335
!*****************************************************************************************
336336

337+
#ifndef INTERGATED_TESTS
337338
!*****************************************************************************************
338339
program jf_test_10
339340

@@ -348,3 +349,4 @@ program jf_test_10
348349

349350
end program jf_test_10
350351
!*****************************************************************************************
352+
#endif

‎src/tests/jf_test_11.F90

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@ end subroutine test_11
274274
end module jf_test_11_mod
275275
!*****************************************************************************************
276276

277+
#ifndef INTERGATED_TESTS
277278
!*****************************************************************************************
278279
program jf_test_11
279280

@@ -288,3 +289,4 @@ program jf_test_11
288289

289290
end program jf_test_11
290291
!*****************************************************************************************
292+
#endif

‎src/tests/jf_test_12.f90

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ end subroutine test_12
232232
end module jf_test_12_mod
233233
!*****************************************************************************************
234234

235+
#ifndef INTERGATED_TESTS
235236
!*****************************************************************************************
236237
program jf_test_12
237238

@@ -246,3 +247,4 @@ program jf_test_12
246247

247248
end program jf_test_12
248249
!*****************************************************************************************
250+
#endif

‎src/tests/jf_test_13.f90

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ end subroutine test_13
6262
end module jf_test_13_mod
6363
!*****************************************************************************************
6464

65+
#ifndef INTERGATED_TESTS
6566
!*****************************************************************************************
6667
program jf_test_13
6768

@@ -75,3 +76,4 @@ program jf_test_13
7576

7677
end program jf_test_13
7778
!*****************************************************************************************
79+
#endif

‎src/tests/jf_test_14.f90

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ end subroutine rename
146146
end module jf_test_14_mod
147147
!*****************************************************************************************
148148

149+
#ifndef INTERGATED_TESTS
149150
!*****************************************************************************************
150151
program jf_test_14
151152

@@ -159,3 +160,4 @@ program jf_test_14
159160

160161
end program jf_test_14
161162
!*****************************************************************************************
163+
#endif

‎src/tests/jf_test_15.f90

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ end subroutine test_15
9898
end module jf_test_15_mod
9999
!*****************************************************************************************
100100

101+
#ifndef INTERGATED_TESTS
101102
!*****************************************************************************************
102103
program jf_test_15
103104

@@ -111,3 +112,4 @@ program jf_test_15
111112

112113
end program jf_test_15
113114
!*****************************************************************************************
115+
#endif

‎src/tests/jf_test_16.f90

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ end subroutine test_16
216216
end module jf_test_16_mod
217217
!*****************************************************************************************
218218

219+
#ifndef INTERGATED_TESTS
219220
!*****************************************************************************************
220221
program jf_test_16
221222

@@ -229,3 +230,4 @@ program jf_test_16
229230

230231
end program jf_test_16
231232
!*****************************************************************************************
233+
#endif

‎src/tests/jf_test_17.f90

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ end subroutine test_17
7171
end module jf_test_17_mod
7272
!*****************************************************************************************
7373

74+
#ifndef INTERGATED_TESTS
7475
!*****************************************************************************************
7576
program jf_test_17
7677

@@ -84,3 +85,4 @@ program jf_test_17
8485

8586
end program jf_test_17
8687
!*****************************************************************************************
88+
#endif

0 commit comments

Comments
 (0)