From ff7fbc9431dc1d32eca2923a6e3d17b16f91648c Mon Sep 17 00:00:00 2001 From: Benoit Jacob Date: Wed, 11 Nov 2009 16:11:33 -0500 Subject: * use standard CMAKE_BUILD_TYPE * remove debug_xxx targets * runtest.sh: don't run make --- test/CMakeLists.txt | 24 ++++++++++++------------ test/runtest.sh | 16 ++++------------ 2 files changed, 16 insertions(+), 24 deletions(-) (limited to 'test') diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 0139f2d0b..14c782e2e 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -98,8 +98,8 @@ ei_add_test(cwiseop) ei_add_test(redux) ei_add_test(visitor) ei_add_test(product_small) -ei_add_test(product_large ${EI_OFLAG}) -ei_add_test(product_extra ${EI_OFLAG}) +ei_add_test(product_large) +ei_add_test(product_extra) ei_add_test(diagonalmatrices) ei_add_test(adjoint) ei_add_test(submatrices) @@ -111,19 +111,19 @@ ei_add_test(array) ei_add_test(array_replicate) ei_add_test(array_reverse) ei_add_test(triangular) -ei_add_test(product_selfadjoint ${EI_OFLAG}) -ei_add_test(product_symm ${EI_OFLAG}) -ei_add_test(product_syrk ${EI_OFLAG}) -ei_add_test(product_trmv ${EI_OFLAG}) -ei_add_test(product_trmm ${EI_OFLAG}) -ei_add_test(product_trsm ${EI_OFLAG}) -ei_add_test(product_notemporary ${EI_OFLAG}) +ei_add_test(product_selfadjoint) +ei_add_test(product_symm) +ei_add_test(product_syrk) +ei_add_test(product_trmv) +ei_add_test(product_trmm) +ei_add_test(product_trsm) +ei_add_test(product_notemporary) ei_add_test(stable_norm) ei_add_test(bandmatrix) ei_add_test(cholesky " " "${GSL_LIBRARIES}") -ei_add_test(lu ${EI_OFLAG}) +ei_add_test(lu) ei_add_test(determinant) -ei_add_test(inverse ${EI_OFLAG}) +ei_add_test(inverse) ei_add_test(qr) ei_add_test(qr_colpivoting) ei_add_test(qr_fullpivoting) @@ -131,7 +131,7 @@ ei_add_test(eigensolver_selfadjoint " " "${GSL_LIBRARIES}") ei_add_test(eigensolver_generic " " "${GSL_LIBRARIES}") ei_add_test(eigensolver_complex) ei_add_test(svd) -ei_add_test(jacobisvd ${EI_OFLAG}) +ei_add_test(jacobisvd) ei_add_test(geo_orthomethods) ei_add_test(geo_homogeneous) ei_add_test(geo_quaternion) diff --git a/test/runtest.sh b/test/runtest.sh index bc693af13..a9e1fd0e1 100755 --- a/test/runtest.sh +++ b/test/runtest.sh @@ -9,20 +9,12 @@ magenta='\E[35m' cyan='\E[36m' white='\E[37m' -if make test_$1 > /dev/null 2> .runtest.log ; then - if ! ./test_$1 r20 > /dev/null 2> .runtest.log ; then - echo -e $red Test $1 failed: $black - echo -e $blue - cat .runtest.log - echo -e $black - exit 1 - else - echo -e $green Test $1 passed$black - fi -else - echo -e $red Build of target $1 failed: $black +if ! ./test_$1 r20 > /dev/null 2> .runtest.log ; then + echo -e $red Test $1 failed: $black echo -e $blue cat .runtest.log echo -e $black exit 1 +else +echo -e $green Test $1 passed$black fi -- cgit v1.2.3