Merge branch 'Visual_studio_integrated_tests' of https://github.com/Hugh-walsh/json-fortran into devel

jacobwilliams · jacobwilliams · commit 31fb6d3d4f26 · 2018-03-08T08:23:05.000-06:00
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,9 @@ visual_studio/*.u2d
 visual_studio/Debug/
 visual_studio/Release/
 visual_studio/x64/
+visual_studio/.vs/
+visual_studio/jsonfortranlib/
+
+visual_studio/jsonfortrantest/Debug/
+*.u2d
+*.user
diff --git a/src/tests/jf_test_1.f90 b/src/tests/jf_test_1.f90
@@ -488,6 +488,7 @@ end subroutine print_json_variable
 end module jf_test_1_mod
 !*****************************************************************************************
 
+#ifndef INTERGATED_TESTS
 !*****************************************************************************************
 program jf_test_1
 
@@ -502,3 +503,4 @@ program jf_test_1
 
 end program jf_test_1
 !*****************************************************************************************
+#endif
diff --git a/src/tests/jf_test_10.f90 b/src/tests/jf_test_10.f90
@@ -334,6 +334,7 @@ end subroutine test_10
 end module jf_test_10_mod
 !*****************************************************************************************
 
+#ifndef INTERGATED_TESTS
 !*****************************************************************************************
 program jf_test_10
 
@@ -348,3 +349,4 @@ program jf_test_10
 
 end program jf_test_10
 !*****************************************************************************************
+#endif
diff --git a/src/tests/jf_test_11.F90 b/src/tests/jf_test_11.F90
@@ -274,6 +274,7 @@ end subroutine test_11
 end module jf_test_11_mod
 !*****************************************************************************************
 
+#ifndef INTERGATED_TESTS
 !*****************************************************************************************
 program jf_test_11
 
@@ -288,3 +289,4 @@ program jf_test_11
 
 end program jf_test_11
 !*****************************************************************************************
+#endif
diff --git a/src/tests/jf_test_12.f90 b/src/tests/jf_test_12.f90
@@ -232,6 +232,7 @@ end subroutine test_12
 end module jf_test_12_mod
 !*****************************************************************************************
 
+#ifndef INTERGATED_TESTS
 !*****************************************************************************************
 program jf_test_12
 
@@ -246,3 +247,4 @@ program jf_test_12
 
 end program jf_test_12
 !*****************************************************************************************
+#endif
diff --git a/src/tests/jf_test_13.f90 b/src/tests/jf_test_13.f90
@@ -62,6 +62,7 @@ end subroutine test_13
 end module jf_test_13_mod
 !*****************************************************************************************
 
+#ifndef INTERGATED_TESTS
 !*****************************************************************************************
 program jf_test_13
 
@@ -75,3 +76,4 @@ program jf_test_13
 
 end program jf_test_13
 !*****************************************************************************************
+#endif
diff --git a/src/tests/jf_test_14.f90 b/src/tests/jf_test_14.f90
@@ -146,6 +146,7 @@ end subroutine rename
 end module jf_test_14_mod
 !*****************************************************************************************
 
+#ifndef INTERGATED_TESTS
 !*****************************************************************************************
 program jf_test_14
 
@@ -159,3 +160,4 @@ program jf_test_14
 
 end program jf_test_14
 !*****************************************************************************************
+#endif
diff --git a/src/tests/jf_test_15.f90 b/src/tests/jf_test_15.f90
@@ -98,6 +98,7 @@ end subroutine test_15
 end module jf_test_15_mod
 !*****************************************************************************************
 
+#ifndef INTERGATED_TESTS
 !*****************************************************************************************
 program jf_test_15
 
@@ -111,3 +112,4 @@ program jf_test_15
 
 end program jf_test_15
 !*****************************************************************************************
+#endif
diff --git a/src/tests/jf_test_16.f90 b/src/tests/jf_test_16.f90
@@ -216,6 +216,7 @@ end subroutine test_16
 end module jf_test_16_mod
 !*****************************************************************************************
 
+#ifndef INTERGATED_TESTS    
 !*****************************************************************************************
 program jf_test_16
 
@@ -229,3 +230,4 @@ program jf_test_16
 
 end program jf_test_16
 !*****************************************************************************************
+#endif
diff --git a/src/tests/jf_test_17.f90 b/src/tests/jf_test_17.f90
@@ -71,6 +71,7 @@ end subroutine test_17
 end module jf_test_17_mod
 !*****************************************************************************************
 
+#ifndef INTERGATED_TESTS
 !*****************************************************************************************
 program jf_test_17
 
@@ -84,3 +85,4 @@ program jf_test_17
 
 end program jf_test_17
 !*****************************************************************************************
+#endif
diff --git a/src/tests/jf_test_18.f90 b/src/tests/jf_test_18.f90
@@ -101,6 +101,7 @@ end subroutine test_18
 end module jf_test_18_mod
 !*****************************************************************************************
 
+#ifndef INTERGATED_TESTS
 !*****************************************************************************************
 program jf_test_18
 
@@ -114,3 +115,4 @@ program jf_test_18
 
 end program jf_test_18
 !*****************************************************************************************
+#endif
diff --git a/src/tests/jf_test_19.f90 b/src/tests/jf_test_19.f90
@@ -160,6 +160,7 @@ end subroutine test_19
 end module jf_test_19_mod
 !*****************************************************************************************
 
+#ifndef INTERGATED_TESTS
 !*****************************************************************************************
 program jf_test_19
 
@@ -175,3 +176,4 @@ program jf_test_19
 
 end program jf_test_19
 !*****************************************************************************************
+#endif
diff --git a/src/tests/jf_test_2.f90 b/src/tests/jf_test_2.f90
@@ -395,6 +395,7 @@ end module jf_test_2_mod
 !*****************************************************************************************
 
 !*****************************************************************************************
+#ifndef INTERGATED_TESTS
 program jf_test_2
 
     !! Second unit test.
@@ -407,4 +408,5 @@ program jf_test_2
     if (n_errors /= 0) stop 1
 
 end program jf_test_2
+#endif
 !*****************************************************************************************
diff --git a/src/tests/jf_test_20.f90 b/src/tests/jf_test_20.f90
@@ -197,6 +197,7 @@ end subroutine test_20
 end module jf_test_20_mod
 !*****************************************************************************************
 
+#ifndef INTERGATED_TESTS
 !*****************************************************************************************
 program jf_test_20
 
@@ -212,3 +213,4 @@ program jf_test_20
 
 end program jf_test_20
 !*****************************************************************************************
+#endif
diff --git a/src/tests/jf_test_21.f90 b/src/tests/jf_test_21.f90
@@ -74,6 +74,7 @@ end subroutine test_21
 end module jf_test_21_mod
 !*****************************************************************************************
 
+#ifndef INTERGATED_TESTS
 !*****************************************************************************************
 program jf_test_21
 
@@ -87,3 +88,4 @@ program jf_test_21
 
 end program jf_test_21
 !*****************************************************************************************
+#endif
diff --git a/src/tests/jf_test_22.f90 b/src/tests/jf_test_22.f90
@@ -76,6 +76,7 @@ end subroutine test_22
 end module jf_test_22_mod
 !*****************************************************************************************
 
+#ifndef INTERGATED_TESTS
 !*****************************************************************************************
 program jf_test_22
 
@@ -90,3 +91,4 @@ program jf_test_22
 
 end program jf_test_22
 !*****************************************************************************************
+#endif
diff --git a/src/tests/jf_test_23.f90 b/src/tests/jf_test_23.f90
@@ -289,6 +289,7 @@ end subroutine test_23
 end module jf_test_23_mod
 !*****************************************************************************************
 
+#ifndef INTERGATED_TESTS
 !*****************************************************************************************
 program jf_test_23
 
@@ -303,3 +304,4 @@ program jf_test_23
 
 end program jf_test_23
 !*****************************************************************************************
+#endif
diff --git a/src/tests/jf_test_24.F90 b/src/tests/jf_test_24.F90
@@ -157,6 +157,7 @@ end subroutine test_24
 end module jf_test_24_mod
 !*****************************************************************************************
 
+#ifndef INTERGATED_TESTS
 !*****************************************************************************************
 program jf_test_24
 
@@ -171,3 +172,4 @@ program jf_test_24
 
 end program jf_test_24
 !*****************************************************************************************
+#endif
diff --git a/src/tests/jf_test_25.F90 b/src/tests/jf_test_25.F90
@@ -146,6 +146,7 @@ end subroutine test_25
 end module jf_test_25_mod
 !*****************************************************************************************
 
+#ifndef INTERGATED_TESTS
 !*****************************************************************************************
 program jf_test_25
 
@@ -160,3 +161,4 @@ program jf_test_25
 
 end program jf_test_25
 !*****************************************************************************************
+#endif
diff --git a/src/tests/jf_test_26.f90 b/src/tests/jf_test_26.f90
@@ -64,6 +64,7 @@ end subroutine test_26
 
 end module jf_test_26_mod
 
+#ifndef INTERGATED_TESTS
 !*****************************************************************************************
 program jf_test_26
 
@@ -78,3 +79,4 @@ program jf_test_26
 
 end program jf_test_26
 !*****************************************************************************************
+#endif
diff --git a/src/tests/jf_test_27.f90 b/src/tests/jf_test_27.f90
@@ -79,6 +79,7 @@ end subroutine test_27
 end module jf_test_27_mod
 !*****************************************************************************************
 
+#ifndef INTERGATED_TESTS
 !*****************************************************************************************
 program jf_test_27
 
@@ -93,3 +94,4 @@ program jf_test_27
 
 end program jf_test_27
 !*****************************************************************************************
+#endif
diff --git a/src/tests/jf_test_29.f90 b/src/tests/jf_test_29.f90
@@ -139,6 +139,7 @@ end subroutine test_29
 end module jf_test_29_mod
 !*****************************************************************************************
 
+#ifndef INTERGATED_TESTS
 !*****************************************************************************************
 program jf_test_29
 
@@ -153,3 +154,4 @@ program jf_test_29
 
 end program jf_test_29
 !*****************************************************************************************
+#endif
diff --git a/src/tests/jf_test_3.f90 b/src/tests/jf_test_3.f90
@@ -138,6 +138,8 @@ end subroutine test_3
 end module jf_test_3_mod
 !*****************************************************************************************
 
+#ifndef INTERGATED_TESTS
+   
 !*****************************************************************************************
 program jf_test_3
 
@@ -152,3 +154,4 @@ program jf_test_3
 
 end program jf_test_3
 !*****************************************************************************************
+#endif
diff --git a/src/tests/jf_test_4.f90 b/src/tests/jf_test_4.f90
@@ -160,6 +160,7 @@ end subroutine test_4
 end module jf_test_4_mod
 !*****************************************************************************************
 
+#ifndef INTERGATED_TESTS
 !*****************************************************************************************
 program jf_test_4
 
@@ -173,3 +174,4 @@ program jf_test_4
     if (n_errors /= 0) stop 1
 end program jf_test_4
 !*****************************************************************************************
+#endif
diff --git a/src/tests/jf_test_5.f90 b/src/tests/jf_test_5.f90
@@ -105,6 +105,7 @@ end subroutine test_5
 end module jf_test_5_mod
 !*****************************************************************************************
 
+#ifndef INTERGATED_TESTS
 !*****************************************************************************************
 program jf_test_5
 
@@ -119,3 +120,4 @@ program jf_test_5
 
 end program jf_test_5
 !*****************************************************************************************
+#endif
diff --git a/src/tests/jf_test_6.f90 b/src/tests/jf_test_6.f90
@@ -69,6 +69,7 @@ end subroutine test_6
 end module jf_test_6_mod
 !*****************************************************************************************
 
+#ifndef INTERGATED_TESTS
 !*****************************************************************************************
 program jf_test_6
 
@@ -83,3 +84,4 @@ program jf_test_6
 
 end program jf_test_6
 !*****************************************************************************************
+#endif
diff --git a/src/tests/jf_test_7.f90 b/src/tests/jf_test_7.f90
@@ -260,6 +260,8 @@ end subroutine test_7
 end module jf_test_7_mod
 !*****************************************************************************************
 
+
+#ifndef INTERGATED_TESTS
 !*****************************************************************************************
 program jf_test_7
 
@@ -274,3 +276,4 @@ program jf_test_7
 
 end program jf_test_7
 !*****************************************************************************************
+#endif
diff --git a/src/tests/jf_test_8.f90 b/src/tests/jf_test_8.f90
@@ -126,6 +126,7 @@ end subroutine test_8
 end module jf_test_8_mod
 !*****************************************************************************************
 
+#ifndef INTERGATED_TESTS    
 !*****************************************************************************************
 program jf_test_8
 
@@ -140,5 +141,5 @@ program jf_test_8
 
 end program jf_test_8
 !*****************************************************************************************
-
+#endif
 !*******************************************************************************************************
diff --git a/src/tests/jf_test_9.f90 b/src/tests/jf_test_9.f90
diff --git a/visual_studio/jsonfortran.sln b/visual_studio/jsonfortran.sln
diff --git a/visual_studio/jsonfortrantest/ReadMe.txt b/visual_studio/jsonfortrantest/ReadMe.txt
diff --git a/visual_studio/jsonfortrantest/jsonfortrantest.f90 b/visual_studio/jsonfortrantest/jsonfortrantest.f90
diff --git a/visual_studio/jsonfortrantest/jsonfortrantest.vfproj b/visual_studio/jsonfortrantest/jsonfortrantest.vfproj
