Merge pull request #82 from bast/radovan/runtest

Use runtest library for testing; fixes #28, fixes #80

.travis.yml

@@ -1,7 +1,7 @@
 language: python
 python:
  - 2.7
- 
+
 sudo: false
 
 matrix:

requirements.txt

@@ -4,3 +4,4 @@ pyparsing
 pyyaml
 sphinx
 sphinx_rtd_theme
+git+https://github.com/bast/runtest.git@master

src/CMakeLists.txt

@@ -1,9 +1,3 @@
-# hack for Travis because we have a strange dependency on numpy header files
-# remove this once we get rid of Cython
-if(DEFINED ENV{TRAVIS_TEST})
-    include_directories(/home/travis/virtualenv/python2.7.9/lib/python2.7/site-packages/numpy/core/include/)
-endif()
-
 include_directories(${CMAKE_BINARY_DIR})
 include(ExternalProject)
 add_subdirectory(libgimic)

src/fgimic/gimic.F90

@@ -322,7 +322,7 @@ subroutine program_header
 call msg_out('***              Written by Jonas Juselius                   ***')
 call msg_out('***                                                          ***')
 call msg_out('***  This software is copyright (c) 2003-2011 by             ***')
-call msg_out('***  Jonas Juselius,  University of Tromsø.                  ***')
+call msg_out('***  Jonas Juselius,  University of Tromso.                  ***')
 call msg_out('***                                                          ***')
 call msg_out('***  You are free to distribute this software under the      ***')
 call msg_out('***  terms of the GNU General Public License                 ***')

test/.gitignore

@@ -0,0 +1,16 @@
+*/*/*.diff
+*/*/*.filtered
+*/*/*.reference
+*/*/stderr
+*/*/stdout
+*/*/grid.xyz
+*/*/mol.xyz
+*/*/acid.txt
+*/*/jmod.txt
+*/*/jvec.txt
+*/*/jvec.vti
+*/*/acid.cube
+*/*/acid.vti
+*/*/jmod.cube
+*/*/jmod.vti
+*/*/jmod_quasi.cube

test/CMakeLists.txt

@@ -8,8 +8,8 @@ set (PYTHON_INSTDIR ${PROJECT_SOURCE_DIR}/src/gimic)
 configure_file(${CMAKE_SOURCE_DIR}/src/gimic.in
     ${CMAKE_CURRENT_BINARY_DIR}/gimic @ONLY
     )
-execute_process(COMMAND 
-    chmod 755 ${CMAKE_CURRENT_BINARY_DIR}/gimic OUTPUT_QUIET) 
+execute_process(COMMAND
+    chmod 755 ${CMAKE_CURRENT_BINARY_DIR}/gimic OUTPUT_QUIET)
 
 # Configure input
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/vectors.inp.in
@@ -24,17 +24,17 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test.py.in
     ${CMAKE_CURRENT_BINARY_DIR}/test.py @ONLY
     )
 execute_process(
-    COMMAND chmod 755 ${CMAKE_CURRENT_BINARY_DIR}/test.py 
+    COMMAND chmod 755 ${CMAKE_CURRENT_BINARY_DIR}/test.py
     OUTPUT_QUIET
-    ) 
+    )
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/PyGimicTest.py.in
     ${CMAKE_CURRENT_BINARY_DIR}/PyGimicTest.py @ONLY
     )
 execute_process(
-    COMMAND chmod 755 ${CMAKE_CURRENT_BINARY_DIR}/test.py 
+    COMMAND chmod 755 ${CMAKE_CURRENT_BINARY_DIR}/test.py
     OUTPUT_QUIET
-    ) 
+    )
 
 # Add tests
 add_test(NAME Vectors
@@ -45,12 +45,18 @@ add_test(NAME BondIntegral
     COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test.py bondint
     )
 
-add_test(
-    NAME shell-test
-    COMMAND ${PROJECT_SOURCE_DIR}/test/gimic-test.sh ${PROJECT_BINARY_DIR}/bin -v
-    )
-
-add_test(
-    NAME 2D-3D
-    COMMAND ${PROJECT_SOURCE_DIR}/test/gimic-test-2D-3D.sh ${PROJECT_BINARY_DIR}/bin -v
-    )
+foreach(_name
+    benzene/integration
+    benzene/2d
+    benzene/3d
+    c4h4/integration
+    )
+    add_test(
+        NAME ${_name}
+        COMMAND ./test
+                --binary-dir=${PROJECT_BINARY_DIR}/bin
+                --work-dir=${PROJECT_BINARY_DIR}/test/${_name}
+                --verbose
+        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/test/${_name}
+        )
+endforeach()