more consistency
This commit is contained in:
		| @@ -2,6 +2,6 @@ | |||||||
|  |  | ||||||
| int main() | int main() | ||||||
| { | { | ||||||
|     std::cout << "Hello World!"; |     std::cout << "PASSED"; | ||||||
|     return 0; |     return 0; | ||||||
| } | } | ||||||
|   | |||||||
| @@ -2,6 +2,6 @@ | |||||||
|  |  | ||||||
| int main() | int main() | ||||||
| { | { | ||||||
|     std::cout << "Hello World!"; |     std::cout << "PASSED"; | ||||||
|     return 0; |     return 0; | ||||||
| } | } | ||||||
|   | |||||||
| @@ -2,6 +2,6 @@ | |||||||
|  |  | ||||||
| int main() | int main() | ||||||
| { | { | ||||||
|     std::cout << "Hello World!"; |     std::cout << "PASSED"; | ||||||
|     return 0; |     return 0; | ||||||
| } | } | ||||||
|   | |||||||
| @@ -2,6 +2,6 @@ module foo | |||||||
|    implicit none |    implicit none | ||||||
| contains | contains | ||||||
|    subroutine hello() |    subroutine hello() | ||||||
|       print *, 'Hello World!' |       print *, 'PASSED' | ||||||
|    end subroutine |    end subroutine | ||||||
| end module | end module | ||||||
|   | |||||||
| @@ -37,9 +37,9 @@ program example | |||||||
|    deallocate(c) |    deallocate(c) | ||||||
|  |  | ||||||
|    if (test_ok) then |    if (test_ok) then | ||||||
|       print *, 'dgemm test ok' |       print *, 'PASSED' | ||||||
|    else |    else | ||||||
|       print *, 'dgemm test failed' |       print *, 'FAILED' | ||||||
|    end if |    end if | ||||||
|  |  | ||||||
| end program | end program | ||||||
|   | |||||||
| @@ -11,6 +11,6 @@ program example | |||||||
|              len(GIT_COMMIT_DATE)   > 0 .and. & |              len(GIT_COMMIT_DATE)   > 0 .and. & | ||||||
|              len(GIT_BRANCH)        > 0 |              len(GIT_BRANCH)        > 0 | ||||||
|  |  | ||||||
|    if (test_ok) print *, 'Test OK!' |    if (test_ok) print *, 'PASSED' | ||||||
|  |  | ||||||
| end program | end program | ||||||
|   | |||||||
| @@ -7,8 +7,8 @@ program example | |||||||
|    i=i8ref |    i=i8ref | ||||||
|    test_ok = (sizeof(i) == 8 .and. i == 2147483648) |    test_ok = (sizeof(i) == 8 .and. i == 2147483648) | ||||||
|    if (test_ok) then |    if (test_ok) then | ||||||
|       print *,"test_int64 ok" |       print *, "PASSED" | ||||||
|    else |    else | ||||||
|       stop "test_int64 failed!" |       stop "FAILED" | ||||||
|    endif |    endif | ||||||
| end program | end program | ||||||
|   | |||||||
| @@ -32,7 +32,7 @@ program example | |||||||
|               dabs(b(3) - 0.25d0) <= small |               dabs(b(3) - 0.25d0) <= small | ||||||
|  |  | ||||||
|    if (roots_ok) then |    if (roots_ok) then | ||||||
|       print *, 'dgesv test ok' |       print *, 'PASSED' | ||||||
|    else |    else | ||||||
|       stop 'ERROR: dgesv test failed!' |       stop 'ERROR: dgesv test failed!' | ||||||
|    endif |    endif | ||||||
|   | |||||||
| @@ -9,8 +9,8 @@ program example | |||||||
|    call MPI_FINALIZE(ierr) |    call MPI_FINALIZE(ierr) | ||||||
|    test_ok=(size==2.and.(rank==0.or.rank==1)) |    test_ok=(size==2.and.(rank==0.or.rank==1)) | ||||||
|    if (test_ok) then |    if (test_ok) then | ||||||
|       if (rank == 0) print *,'Test OK!' |       if (rank == 0) print *, 'PASSED' | ||||||
|    else |    else | ||||||
|       stop "test fc_mpi failed!" |       stop "FAILED" | ||||||
|    endif |    endif | ||||||
| end program | end program | ||||||
|   | |||||||
							
								
								
									
										24
									
								
								test/test.py
									
									
									
									
									
								
							
							
						
						
									
										24
									
								
								test/test.py
									
									
									
									
									
								
							| @@ -115,44 +115,50 @@ def configure_build_and_exe(name, setup_command, launcher=None): | |||||||
|  |  | ||||||
| def test_cxx_custom(): | def test_cxx_custom(): | ||||||
|     stdout, stderr = configure_build_and_exe('cxx_custom', 'python setup.py --cxx=g++') |     stdout, stderr = configure_build_and_exe('cxx_custom', 'python setup.py --cxx=g++') | ||||||
|     assert 'Hello World!' in stdout |     assert 'PASSED' in stdout | ||||||
|  |  | ||||||
| # ------------------------------------------------------------------------------ | # ------------------------------------------------------------------------------ | ||||||
|  |  | ||||||
|  |  | ||||||
| def test_extra_cmake_options(): | def test_extra_cmake_options(): | ||||||
|     stdout, stderr = configure_build_and_exe('extra_cmake_options', 'python setup.py --cxx=g++ --cmake-options="-DENABLE_SOMETHING=OFF -DENABLE_FOO=ON"') |     stdout, stderr = configure_build_and_exe('extra_cmake_options', 'python setup.py --cxx=g++ --cmake-options="-DENABLE_SOMETHING=OFF -DENABLE_FOO=ON"') | ||||||
|     assert 'Hello World!' in stdout |     assert 'PASSED' in stdout | ||||||
|  |  | ||||||
| # ------------------------------------------------------------------------------ | # ------------------------------------------------------------------------------ | ||||||
|  |  | ||||||
|  |  | ||||||
| def test_cxx(): | def test_cxx(): | ||||||
|     stdout, stderr = configure_build_and_exe('cxx', 'python setup.py --cxx=g++') |     stdout, stderr = configure_build_and_exe('cxx', 'python setup.py --cxx=g++') | ||||||
|     assert 'Hello World!' in stdout |     assert 'PASSED' in stdout | ||||||
|  |  | ||||||
| # ------------------------------------------------------------------------------ | # ------------------------------------------------------------------------------ | ||||||
|  |  | ||||||
|  |  | ||||||
| def test_fc(): | def test_fc(): | ||||||
|     stdout, stderr = configure_build_and_exe('fc', 'python setup.py --fc=gfortran') |     stdout, stderr = configure_build_and_exe('fc', 'python setup.py --fc=gfortran') | ||||||
|     assert 'Hello World!' in stdout |     assert 'PASSED' in stdout | ||||||
|  |  | ||||||
|  | # ------------------------------------------------------------------------------ | ||||||
|  |  | ||||||
|  |  | ||||||
| def test_fc_git_info(): | def test_fc_git_info(): | ||||||
|     stdout, stderr = configure_build_and_exe('fc_git_info', 'python setup.py --fc=gfortran') |     stdout, stderr = configure_build_and_exe('fc_git_info', 'python setup.py --fc=gfortran') | ||||||
|     assert 'Test OK!' in stdout |     assert 'PASSED' in stdout | ||||||
|  |  | ||||||
|  | # ------------------------------------------------------------------------------ | ||||||
|  |  | ||||||
|  |  | ||||||
| def test_fc_int64(): | def test_fc_int64(): | ||||||
|     stdout, stderr = configure_build_and_exe('fc_int64', 'python setup.py --fc=gfortran --int64') |     stdout, stderr = configure_build_and_exe('fc_int64', 'python setup.py --fc=gfortran --int64') | ||||||
|     assert 'test_int64 ok' in stdout |     assert 'PASSED' in stdout | ||||||
|  |  | ||||||
|  | # ------------------------------------------------------------------------------ | ||||||
|  |  | ||||||
|  |  | ||||||
| def test_fc_mpi(): | def test_fc_mpi(): | ||||||
|     if sys.platform != 'win32': |     if sys.platform != 'win32': | ||||||
|         stdout, stderr = configure_build_and_exe('fc_mpi', 'python setup.py --mpi --fc=mpif90', 'mpirun -np 2') |         stdout, stderr = configure_build_and_exe('fc_mpi', 'python setup.py --mpi --fc=mpif90', 'mpirun -np 2') | ||||||
|         assert 'Test OK!' in stdout |         assert 'PASSED' in stdout | ||||||
|     else: |     else: | ||||||
|         pass |         pass | ||||||
|  |  | ||||||
| @@ -162,7 +168,7 @@ def test_fc_mpi(): | |||||||
| def test_fc_blas(): | def test_fc_blas(): | ||||||
|     if sys.platform != 'win32': |     if sys.platform != 'win32': | ||||||
|         stdout, stderr = configure_build_and_exe('fc_blas', 'python setup.py --fc=gfortran') |         stdout, stderr = configure_build_and_exe('fc_blas', 'python setup.py --fc=gfortran') | ||||||
|         assert 'dgemm test ok' in stdout |         assert 'PASSED' in stdout | ||||||
|     else: |     else: | ||||||
|         pass |         pass | ||||||
|  |  | ||||||
| @@ -172,6 +178,6 @@ def test_fc_blas(): | |||||||
| def test_fc_lapack(): | def test_fc_lapack(): | ||||||
|     if sys.platform != 'win32': |     if sys.platform != 'win32': | ||||||
|         stdout, stderr = configure_build_and_exe('fc_lapack', 'python setup.py --fc=gfortran') |         stdout, stderr = configure_build_and_exe('fc_lapack', 'python setup.py --fc=gfortran') | ||||||
|         assert 'dgesv test ok' in stdout |         assert 'PASSED' in stdout | ||||||
|     else: |     else: | ||||||
|         pass |         pass | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user