Fix FTBFS on vcardparser tests from prior commit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 1571e61744)
pull/16/head
Slávek Banko 8 years ago
parent 83681c9b08
commit aca3958191

@ -90,34 +90,26 @@ tde_add_executable( testvcardformatimpl
LINK ${TDEABC_TESTS_LINK} LINK ${TDEABC_TESTS_LINK}
) )
add_custom_target(test ALL echo "performing tests on vcardparser" add_custom_target( vcardparser_tests ALL
COMMAND bash ./test.sh COMMENT "[VCardParser] Performing tests"
DEPENDS testing COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/FAILED
DEPENDS
testvcardformatimpl testvcardformat testwrite2 testwrite testread2 testread
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
) )
add_custom_target(testing ALL echo "creating test infrastructure" file( GLOB vcardparser_testfiles "tests/*.vcf" )
DEPENDS testvcardformatimpl testvcardformat testwrite2 testwrite testread2 testread list( REMOVE_ITEM vcardparser_testfiles "${CMAKE_CURRENT_SOURCE_DIR}/tests/vcard5.vcf" )
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} list( SORT vcardparser_testfiles )
)
add_custom_command(
TARGET testing PRE_BUILD
COMMAND test
ARGS -f ${CMAKE_CURRENT_BINARY_DIR}/test.sh || ln -s ${CMAKE_SOURCE_DIR}/tdeabc/vcardparser/test.sh ${CMAKE_CURRENT_BINARY_DIR}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
foreach(testfile ${vcardparser_testfiles})
add_custom_command( add_custom_command(
TARGET testing PRE_BUILD TARGET vcardparser_tests
COMMAND test COMMAND perl ${CMAKE_CURRENT_SOURCE_DIR}/checkvcard.pl ${testfile}
ARGS -f ${CMAKE_CURRENT_BINARY_DIR}/checkvcard.pl || ln -s ${CMAKE_SOURCE_DIR}/tdeabc/vcardparser/checkvcard.pl ${CMAKE_CURRENT_BINARY_DIR}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
) )
endforeach(testfile)
add_custom_command( add_custom_command(
TARGET testing PRE_BUILD TARGET vcardparser_tests
COMMAND test COMMAND test ! -f ${CMAKE_CURRENT_BINARY_DIR}/FAILED
ARGS -d ${CMAKE_CURRENT_BINARY_DIR}/tests || ln -s ${CMAKE_SOURCE_DIR}/tdeabc/vcardparser/tests ${CMAKE_CURRENT_BINARY_DIR}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
) )

@ -1,11 +0,0 @@
TESTFILES="vcard1.vcf vcard2.vcf vcard3.vcf vcard4.vcf vcard6.vcf vcard7.vcf vcard8.vcf vcard9.vcf"
test -f FAILED && rm -f FAILED
for i in $TESTFILES;
do perl ./checkvcard.pl ./tests/$i ;
done;
if [ -f FAILED ]; then
echo ERROR
exit 1
fi
Loading…
Cancel
Save