Merge pull request #20 from wavebitscientific/add-tests-to-fpm-manifest

Add tests to fpm manifest
wavebitscientific · Nov 20, 2020 · d79a2b5 · d79a2b5
2 parents 3af0e6d + ed80bfc
commit d79a2b5
Show file tree

Hide file tree

Showing 34 changed files with 434 additions and 426 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+build
+
 # Compiled Object files
 *.slo
 *.lo

diff --git a/AUTHORS b/AUTHORS
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,13 +34,13 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES Cray)
 endif()
 
 # library to archive (libfunctional.a)
-add_library(functional src/lib/mod_functional.f90 src/lib/mod_interfaces.f90)
-add_library(testing src/tests/mod_testing.f90)
+add_library(functional src/functional.f90)
+add_library(testing test/testing.f90)
 
 # tests
 enable_testing()
 foreach(execid arange arrstr complement empty filter foldl foldr foldt head init insert intersection iterfold last limit map reverse set sort split strarr subscript tail unfold union)
-  add_executable(test_${execid} src/tests/test_${execid}.f90)
+  add_executable(test_${execid} test/test_${execid}.f90)
   target_link_libraries(test_${execid} functional testing)
   add_test(test_${execid} bin/test_${execid})
 endforeach()