Merge 62a1037 into 95f8e74

OSGeo · Dec 17, 2017 · 60b36b0 · 60b36b0
2 parents 95f8e74 + 62a1037
commit 60b36b0
Show file tree

Hide file tree

Showing 36 changed files with 7,962 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -149,4 +149,5 @@ add_subdirectory(nad)
 add_subdirectory(src)
 add_subdirectory(man)
 add_subdirectory(cmake)
+add_subdirectory(test)
 
diff --git a/appveyor.yml b/appveyor.yml
@@ -55,6 +55,7 @@ test_script:
   - dir
   - cd ..
   - dir
+  - if "%BUILD_TYPE%" == "cmake" ctest -C Release --output-on-failure
   - cd bin
   - echo "Contents of current directory:"
   - dir

diff --git a/cmake/Proj4Test.cmake b/cmake/Proj4Test.cmake
@@ -5,7 +5,7 @@
 function(proj_add_test_script_sh SH_NAME BIN_USE)
   if(UNIX)
     get_filename_component(testname ${SH_NAME} NAME_WE)
-    
+
     set(TEST_OK 1)
     if(ARGV2)
          set(TEST_OK 0)
@@ -14,19 +14,32 @@ function(proj_add_test_script_sh SH_NAME BIN_USE)
             set(TEST_OK 1)
          endif(EXISTS ${GRID_FULLNAME})
     endif(ARGV2)
-    
+
     if( CMAKE_VERSION VERSION_LESS 2.8.4 )
        set(TEST_OK 0)
        message(STATUS "test with bash script need a cmake version >= 2.8.4")
     endif()
- 
+
     if(${TEST_OK})
       add_test( NAME "${testname}"
                 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/nad
-                COMMAND  ${PROJECT_SOURCE_DIR}/nad/${SH_NAME} 
-                         ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${${BIN_USE}} 
+                COMMAND  ${PROJECT_SOURCE_DIR}/nad/${SH_NAME}
+                         ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${${BIN_USE}}
                )
     endif(${TEST_OK})
-    
+
   endif(UNIX)
 endfunction()
+
+
+function(proj_add_gie_test TESTNAME TESTCASE)
+
+    set(GIE_BIN "gie")
+    set(TESTFILE ${CMAKE_SOURCE_DIR}/test/${TESTCASE})
+    add_test( NAME ${TESTNAME}
+              WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/test
+              COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${GIE_BIN} 
+                      ${TESTFILE}
+            )
+
+endfunction()
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -0,0 +1,40 @@
+set(GIE_BIN "gie")
+
+# Regression tests
+proj_add_gie_test("Builtins" "gie/builtins.gie")
+proj_add_gie_test("Builtins2" "gie/more_builtins.gie")
+proj_add_gie_test("Axisswap" "gie/axisswap.gie")
+proj_add_gie_test("Deformation" "gie/deformation.gie")
+proj_add_gie_test("Ellipsoid" "gie/ellipsoid.gie")
+proj_add_gie_test("GDA" "gie/GDA.gie")
+
+proj_add_gie_test("GIGS-5101.1-jhs" "gigs/5101.1-jhs.gie")
+proj_add_gie_test("GIGS-5101.2-jhs" "gigs/5101.2-jhs.gie")
+proj_add_gie_test("GIGS-5101.3-jhs" "gigs/5101.3-jhs.gie")
+proj_add_gie_test("GIGS-5101.4-jhs-etmerc" "gigs/5101.4-jhs-etmerc.gie")
+#proj_add_gie_test("GIGS-5101.4-jhs" "gigs/5101.4-jhs.gie")
+proj_add_gie_test("GIGS-5102.1" "gigs/5102.1.gie")
+#proj_add_gie_test("GIGS-5102.2" "gigs/5102.2.gie")
+proj_add_gie_test("GIGS-5103.1" "gigs/5103.1.gie")
+proj_add_gie_test("GIGS-5103.2" "gigs/5103.2.gie")
+proj_add_gie_test("GIGS-5103.3" "gigs/5103.3.gie")
+proj_add_gie_test("GIGS-5104" "gigs/5104.gie")
+#proj_add_gie_test("GIGS-5105.1" "gigs/5105.1.gie")
+proj_add_gie_test("GIGS-5105.2" "gigs/5105.2.gie")
+proj_add_gie_test("GIGS-5106" "gigs/5106.gie")
+proj_add_gie_test("GIGS-5107" "gigs/5107.gie")
+#proj_add_gie_test("GIGS-5108" "gigs/5108.gie")
+proj_add_gie_test("GIGS-5109" "gigs/5109.gie")
+#proj_add_gie_test("GIGS-5110" "gigs/5110.gie")
+proj_add_gie_test("GIGS-5111.1" "gigs/5111.1.gie")
+#proj_add_gie_test("GIGS-5111.2" "gigs/5111.2.gie")
+proj_add_gie_test("GIGS-5112" "gigs/5112.gie")
+#proj_add_gie_test("GIGS-5113" "gigs/5113.gie")
+#proj_add_gie_test("GIGS-5201" "gigs/5201.gie")
+#proj_add_gie_test("GIGS-5203" "gigs/5203.1.gie")
+#proj_add_gie_test("GIGS-5204.1" "gigs/5204.1.gie")
+#proj_add_gie_test("GIGS-5205.1" "gigs/5205.1.gie")
+#proj_add_gie_test("GIGS-5206" "gigs/5206.gie")
+#proj_add_gie_test("GIGS-5207.1" "gigs/5207.1.gie")
+#proj_add_gie_test("GIGS-5207.2" "gigs/5207.2.gie")
+#proj_add_gie_test("GIGS-5208" "gigs/5208.gie")