Commit cd88f721 authored by ulrich_y's avatar ulrich_y

Sorted #if in test

parent 22079d40
...@@ -30,7 +30,7 @@ PROGRAM TEST ...@@ -30,7 +30,7 @@ PROGRAM TEST
call get_command_argument(i,arg) call get_command_argument(i,arg)
read(arg,*) verb ! str to int read(arg,*) verb ! str to int
#else #else
call errprint("-verb not available, compile with --debug") call errprint("Argument -verb is not available, compile with --debug")
#endif #endif
case('-mpl-test') case('-mpl-test')
tol = zero * 1.e5_prec tol = zero * 1.e5_prec
...@@ -42,8 +42,7 @@ PROGRAM TEST ...@@ -42,8 +42,7 @@ PROGRAM TEST
tol = 8.0e-7 tol = 8.0e-7
tests_successful = tests_successful .and. do_chen_test() tests_successful = tests_successful .and. do_chen_test()
#ifdef HAVE_GINAC #if defined(HAVE_GINAC) && defined(HAVE_MM)
#ifdef HAVE_MM
case('-ginac-tests') case('-ginac-tests')
tol = 8.0e-7 tol = 8.0e-7
call do_ginac_tests call do_ginac_tests
...@@ -55,10 +54,18 @@ PROGRAM TEST ...@@ -55,10 +54,18 @@ PROGRAM TEST
case ('-hw-tests') case ('-hw-tests')
tol = 8.0e-7 tol = 8.0e-7
call do_high_weight_tests call do_high_weight_tests
#else
case('-ginac-tests', '-speed-tests', '-hw-tests')
call errprint("Argument "//trim(arg)//" is not available, compile with --with-ginac --with-mcc")
#endif
#ifdef HAVE_GINAC
case ('-long-test') case ('-long-test')
tol = 8.0e-7 tol = 8.0e-7
call do_long_test call do_long_test
#endif #else
case('-long-test')
call errprint("Argument "//trim(arg)//" is not available, compile with --with-ginac")
#endif #endif
case ('-report') case ('-report')
#ifdef DEBUG #ifdef DEBUG
...@@ -69,10 +76,8 @@ PROGRAM TEST ...@@ -69,10 +76,8 @@ PROGRAM TEST
call do_GPL_tests call do_GPL_tests
tol = 8.0e-7 tol = 8.0e-7
tests_successful = tests_successful .and. do_chen_test() tests_successful = tests_successful .and. do_chen_test()
#ifdef HAVE_GINAC #if defined(HAVE_GINAC) && defined(HAVE_MM)
#ifdef HAVE_MM
call do_ginac_tests call do_ginac_tests
#endif
#endif #endif
case default case default
...@@ -470,7 +475,6 @@ CONTAINS ...@@ -470,7 +475,6 @@ CONTAINS
#ifdef HAVE_GINAC #ifdef HAVE_GINAC
#ifdef HAVE_MM
function evalt(arr, what) function evalt(arr, what)
#if KINDREAL==16 #if KINDREAL==16
...@@ -505,6 +509,9 @@ CONTAINS ...@@ -505,6 +509,9 @@ CONTAINS
endif endif
end function end function
#ifdef HAVE_MM
subroutine perform_ginacv(n, args) subroutine perform_ginacv(n, args)
use maths_functions, only:clearcache use maths_functions, only:clearcache
complex(kind=prec) :: args(:,:) complex(kind=prec) :: args(:,:)
...@@ -533,7 +540,6 @@ CONTAINS ...@@ -533,7 +540,6 @@ CONTAINS
end subroutine end subroutine
#ifndef NOSPEED
subroutine do_one_speed_test(args, u, msg) subroutine do_one_speed_test(args, u, msg)
use maths_functions, only:clearcache use maths_functions, only:clearcache
implicit none implicit none
...@@ -836,7 +842,7 @@ CONTAINS ...@@ -836,7 +842,7 @@ CONTAINS
#endif #endif
#endif
! subroutine do_shuffle_tests() ! subroutine do_shuffle_tests()
! complex(kind=prec) :: v(2) = cmplx((/1,2/)) ! complex(kind=prec) :: v(2) = cmplx((/1,2/))
! complex(kind=prec) :: w(2) = cmplx((/3,4/)) ! complex(kind=prec) :: w(2) = cmplx((/3,4/))
......
...@@ -747,7 +747,7 @@ build/%.o: src/%.f90 ...@@ -747,7 +747,7 @@ build/%.o: src/%.f90
build/%.o: checks/%.f90 build/%.o: checks/%.f90
@echo "F90 \$@" @echo "F90 \$@"
@\$(FC) \$(FFLAGS) -c \$< -o \$@ @\$(FC) \$(FFLAGS) -Wno-unused-function -c \$< -o \$@
build/%.o: src/%.cpp build/%.o: src/%.cpp
@echo "C++ \$@" @echo "C++ \$@"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment