Merge pull request #391 from jacobwilliams/390-typo-fix

jacobwilliams · web-flow · commit 76fedc1eb1b5 · 2019-01-26T19:03:45.000-06:00
Renamed the integrated tests preprocessor flag.
diff --git a/src/tests/jf_test_01.F90 b/src/tests/jf_test_01.F90
@@ -499,7 +499,7 @@ end subroutine print_json_variable
 end module jf_test_1_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_1
 
diff --git a/src/tests/jf_test_02.F90 b/src/tests/jf_test_02.F90
@@ -408,7 +408,7 @@ end module jf_test_2_mod
 !*****************************************************************************************
 
 !*****************************************************************************************
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 program jf_test_2
 
     !! Second unit test.
diff --git a/src/tests/jf_test_03.F90 b/src/tests/jf_test_03.F90
@@ -141,7 +141,7 @@ end subroutine test_3
 end module jf_test_3_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 
 !*****************************************************************************************
 program jf_test_3
diff --git a/src/tests/jf_test_04.F90 b/src/tests/jf_test_04.F90
@@ -163,7 +163,7 @@ end subroutine test_4
 end module jf_test_4_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_4
 
diff --git a/src/tests/jf_test_05.F90 b/src/tests/jf_test_05.F90
@@ -108,7 +108,7 @@ end subroutine test_5
 end module jf_test_5_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_5
 
diff --git a/src/tests/jf_test_06.F90 b/src/tests/jf_test_06.F90
@@ -111,7 +111,7 @@ end subroutine test_6
 end module jf_test_6_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_6
 
diff --git a/src/tests/jf_test_07.F90 b/src/tests/jf_test_07.F90
@@ -264,7 +264,7 @@ end module jf_test_7_mod
 !*****************************************************************************************
 
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_7
 
diff --git a/src/tests/jf_test_08.F90 b/src/tests/jf_test_08.F90
@@ -129,7 +129,7 @@ end subroutine test_8
 end module jf_test_8_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_8
 
diff --git a/src/tests/jf_test_09.F90 b/src/tests/jf_test_09.F90
@@ -144,7 +144,7 @@ end subroutine read_file
 
 end module jf_test_9_mod
 !*****************************************************************************************
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_9
 
diff --git a/src/tests/jf_test_10.F90 b/src/tests/jf_test_10.F90
@@ -337,7 +337,7 @@ end subroutine test_10
 end module jf_test_10_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_10
 
diff --git a/src/tests/jf_test_11.F90 b/src/tests/jf_test_11.F90
@@ -277,7 +277,7 @@ end subroutine test_11
 end module jf_test_11_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_11
 
diff --git a/src/tests/jf_test_12.F90 b/src/tests/jf_test_12.F90
@@ -235,7 +235,7 @@ end subroutine test_12
 end module jf_test_12_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_12
 
diff --git a/src/tests/jf_test_13.F90 b/src/tests/jf_test_13.F90
@@ -65,7 +65,7 @@ end subroutine test_13
 end module jf_test_13_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_13
 
diff --git a/src/tests/jf_test_14.F90 b/src/tests/jf_test_14.F90
@@ -149,7 +149,7 @@ end subroutine rename
 end module jf_test_14_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_14
 
diff --git a/src/tests/jf_test_15.F90 b/src/tests/jf_test_15.F90
@@ -107,7 +107,7 @@ end subroutine test_15
 end module jf_test_15_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_15
 
diff --git a/src/tests/jf_test_16.F90 b/src/tests/jf_test_16.F90
@@ -219,7 +219,7 @@ end subroutine test_16
 end module jf_test_16_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_16
 
diff --git a/src/tests/jf_test_17.F90 b/src/tests/jf_test_17.F90
@@ -173,7 +173,7 @@ end subroutine test_17
 end module jf_test_17_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_17
 
diff --git a/src/tests/jf_test_18.F90 b/src/tests/jf_test_18.F90
@@ -109,7 +109,7 @@ end subroutine test_18
 end module jf_test_18_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_18
 
diff --git a/src/tests/jf_test_19.F90 b/src/tests/jf_test_19.F90
@@ -163,7 +163,7 @@ end subroutine test_19
 end module jf_test_19_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_19
 
diff --git a/src/tests/jf_test_20.F90 b/src/tests/jf_test_20.F90
@@ -200,7 +200,7 @@ end subroutine test_20
 end module jf_test_20_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_20
 
diff --git a/src/tests/jf_test_21.F90 b/src/tests/jf_test_21.F90
@@ -77,7 +77,7 @@ end subroutine test_21
 end module jf_test_21_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_21
 
diff --git a/src/tests/jf_test_22.F90 b/src/tests/jf_test_22.F90
@@ -79,7 +79,7 @@ end subroutine test_22
 end module jf_test_22_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_22
 
diff --git a/src/tests/jf_test_23.F90 b/src/tests/jf_test_23.F90
@@ -292,7 +292,7 @@ end subroutine test_23
 end module jf_test_23_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_23
 
diff --git a/src/tests/jf_test_24.F90 b/src/tests/jf_test_24.F90
@@ -160,7 +160,7 @@ end subroutine test_24
 end module jf_test_24_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_24
 
diff --git a/src/tests/jf_test_25.F90 b/src/tests/jf_test_25.F90
@@ -149,7 +149,7 @@ end subroutine test_25
 end module jf_test_25_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_25
 
diff --git a/src/tests/jf_test_26.F90 b/src/tests/jf_test_26.F90
@@ -67,7 +67,7 @@ end subroutine test_26
 
 end module jf_test_26_mod
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_26
 
diff --git a/src/tests/jf_test_27.F90 b/src/tests/jf_test_27.F90
@@ -82,7 +82,7 @@ end subroutine test_27
 end module jf_test_27_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_27
 
diff --git a/src/tests/jf_test_28.F90 b/src/tests/jf_test_28.F90
@@ -116,7 +116,7 @@ end subroutine test_28
     end module jf_test_28_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_28
 
diff --git a/src/tests/jf_test_29.F90 b/src/tests/jf_test_29.F90
@@ -142,7 +142,7 @@ end subroutine test_29
 end module jf_test_29_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_29
 
diff --git a/src/tests/jf_test_30.F90 b/src/tests/jf_test_30.F90
@@ -69,7 +69,7 @@ end subroutine test_30
 end module jf_test_30_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_30
 
diff --git a/src/tests/jf_test_31.F90 b/src/tests/jf_test_31.F90
@@ -94,7 +94,7 @@ end subroutine test_31
 end module jf_test_31_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_31
 
diff --git a/src/tests/jf_test_32.F90 b/src/tests/jf_test_32.F90
@@ -109,7 +109,7 @@ end subroutine test_32
 end module jf_test_32_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_32
 
diff --git a/src/tests/jf_test_33.F90 b/src/tests/jf_test_33.F90
@@ -94,7 +94,7 @@ end subroutine test_33
 end module jf_test_33_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_33
 
diff --git a/src/tests/jf_test_34.F90 b/src/tests/jf_test_34.F90
@@ -147,7 +147,7 @@ end subroutine test_34
 end module jf_test_34_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_34
 
diff --git a/src/tests/jf_test_35.F90 b/src/tests/jf_test_35.F90
@@ -85,7 +85,7 @@ end subroutine test_35
 end module jf_test_35_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_35
 
diff --git a/src/tests/jf_test_36.F90 b/src/tests/jf_test_36.F90
@@ -118,7 +118,7 @@ end subroutine test_36
 end module jf_test_36_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_36
 
diff --git a/src/tests/jf_test_37.F90 b/src/tests/jf_test_37.F90
@@ -125,7 +125,7 @@ end subroutine test_37
 end module jf_test_37_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_37
 
diff --git a/src/tests/jf_test_38.F90 b/src/tests/jf_test_38.F90
@@ -131,7 +131,7 @@ end subroutine test_38
 end module jf_test_38_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_38
 
diff --git a/src/tests/jf_test_39.F90 b/src/tests/jf_test_39.F90
@@ -64,7 +64,7 @@ end subroutine test_39
 end module jf_test_39_mod
 !*****************************************************************************************
 
-#ifndef INTERGATED_TESTS
+#ifndef INTEGRATED_TESTS
 !*****************************************************************************************
 program jf_test_39
 
diff --git a/visual_studio/jsonfortrantest/jsonfortrantest.f90 b/visual_studio/jsonfortrantest/jsonfortrantest.f90
@@ -44,6 +44,8 @@ program jsonfortrantest
     use jf_test_35_mod , only: test_35
     use jf_test_36_mod , only: test_36
     use jf_test_37_mod , only: test_37
+    use jf_test_38_mod , only: test_38
+    use jf_test_39_mod , only: test_39
 
     implicit none
 
@@ -88,6 +90,8 @@ program jsonfortrantest
     call test_35(n_errors); if (n_errors /= 0) stop 1
     call test_36(n_errors); if (n_errors /= 0) stop 1
     call test_37(n_errors); if (n_errors /= 0) stop 1
+    call test_38(n_errors); if (n_errors /= 0) stop 1
+    call test_39(n_errors); if (n_errors /= 0) stop 1
 
     end program jsonfortrantest
 !*****************************************************************************************
diff --git a/visual_studio/jsonfortrantest/jsonfortrantest.vfproj b/visual_studio/jsonfortrantest/jsonfortrantest.vfproj
