diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d354b60..47e8e2c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -486,7 +486,7 @@ install(TARGETS diamond DESTINATION bin) enable_testing() SET(TD ${CMAKE_SOURCE_DIR}/src/test) SET(SP -DTEST_DIR=${CMAKE_SOURCE_DIR}/src/test -P ${CMAKE_SOURCE_DIR}/src/test/test.cmake) -add_test(NAME blastp COMMAND ${CMAKE_COMMAND} -DNAME=blastp "-DARGS=blastp -q ${TD}/1.faa -d ${TD}/2.faa" ${SP}) -add_test(NAME blastp-mid-sens COMMAND ${CMAKE_COMMAND} -DNAME=blastp-mid-sens "-DARGS=blastp -q ${TD}/3.faa -d ${TD}/4.faa --mid-sensitive" ${SP}) -add_test(NAME blastp-f0 COMMAND ${CMAKE_COMMAND} -DNAME=blastp-f0 "-DARGS=blastp -q ${TD}/1.faa -d ${TD}/2.faa -f 0" ${SP}) +add_test(NAME blastp COMMAND ${CMAKE_COMMAND} -DNAME=blastp "-DARGS=blastp -q ${TD}/1.faa -d ${TD}/2.faa -p1" ${SP}) +add_test(NAME blastp-mid-sens COMMAND ${CMAKE_COMMAND} -DNAME=blastp-mid-sens "-DARGS=blastp -q ${TD}/3.faa -d ${TD}/4.faa --mid-sensitive -p1" ${SP}) +add_test(NAME blastp-f0 COMMAND ${CMAKE_COMMAND} -DNAME=blastp-f0 "-DARGS=blastp -q ${TD}/1.faa -d ${TD}/2.faa -f0 -p1" ${SP}) add_test(NAME diamond COMMAND diamond test) \ No newline at end of file diff --git a/src/test/test.cmake b/src/test/test.cmake index fa91eeaf..91c6bde7 100644 --- a/src/test/test.cmake +++ b/src/test/test.cmake @@ -1,5 +1,6 @@ -SET(CMD "diamond ${ARGS} -o ${NAME}.out") -separate_arguments (SEP NATIVE_COMMAND PROGRAM SEPARATE_ARGS ${CMD}) +SET(CMD "./diamond ${ARGS} -o ${NAME}.out") +#separate_arguments (SEP NATIVE_COMMAND PROGRAM SEPARATE_ARGS ${CMD}) +separate_arguments (SEP NATIVE_COMMAND ${CMD}) execute_process(COMMAND ${SEP} RESULT_VARIABLE CMD_RESULT) execute_process(COMMAND diff ${TEST_DIR}/${NAME}.out ${NAME}.out RESULT_VARIABLE DIFF_RESULT) if(NOT ${DIFF_RESULT} EQUAL 0)