diff --git a/CMakeLists.txt b/CMakeLists.txt index db9e3a02..bd77f6d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,20 +103,20 @@ if( EXIV2_BUILD_SAMPLES ) add_custom_target(tests COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make unit_test COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make ${TEST} - COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make new_tests + COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make python_tests COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make version_test WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test" ) else() add_custom_target(tests COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make ${TEST} - COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make new_tests + COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make python_tests COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make version_test WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test" ) endif() - add_custom_target(new_tests - COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make new_tests + add_custom_target(python_tests + COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make python_tests WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test" ) add_custom_target(bash_tests diff --git a/README.md b/README.md index 87221a19..3f6d1e8e 100644 --- a/README.md +++ b/README.md @@ -742,8 +742,8 @@ There are different kinds of tests: |:-- |:-- |:-- |:-- |:-- | | Run all tests | | | $ make tests | | | Bash scripts | bash | \/test | $ make bash_tests | -DEXIV2\_BUILD\_SAMPLES=On | -| Python scripts | python | \/tests | $ make new_tests | -DEXIV2\_BUILD\_SAMPLES=On | -| Unit tests | C++ | \/unitTests | $ make unit_test | -DEXIV2\_BUILD\_UNIT\_TESTS_=On | +| Python scripts | python | \/tests | $ make python_tests | -DEXIV2\_BUILD\_SAMPLES=On | +| Unit tests | C++ | \/unitTests | $ make unit_test | -DEXIV2\_BUILD\_UNIT\_TESTS=On | | Version test | C++ | \/src/version.cpp | $ make version_test | Always in library | Environment Variables used by test suite @@ -780,7 +780,7 @@ $ env EXIV2_BINDIR=${PWD}/../build/bin ./icc-test.sh ICC jpg md5 webp md5 png md5 jpg md5 all testcases passed. -$ env EXIV2_BINDIR=${PWD}/../build/bin make new_tests +$ env EXIV2_BINDIR=${PWD}/../build/bin make python_tests ... lots of output ... test_run (tiff_test.test_tiff_test_program.TestTiffTestProg) ... ok ---------------------------------------------------------------------- @@ -814,7 +814,7 @@ Once you have modified the PATH and exported EXIV2\_BINDIR and EXIV2\_EXT, you c ```bash $ cd /test $ make tests -$ make new_tests +$ make python_tests $ ./icc-test.sh ``` diff --git a/test/Makefile b/test/Makefile index d73698b3..d77ba321 100644 --- a/test/Makefile +++ b/test/Makefile @@ -153,6 +153,7 @@ alltest: if [ $$rc -ne 0 ]; then echo '***' ; echo '***' $$p result = $$rc ; echo '***' ; fi ; \ if [ $$rc -ne 0 ]; then echo '***' $$p result = $$rc >> tmp/test-failed ; fi ; \ done + @if [ -e tmp/test-failed ]; then echo ; echo '***' FAILED ; cat tmp/test-failed ; echo '***' ; fi unixtest: @echo @@ -167,8 +168,9 @@ unixtest: if [ $$rc -ne 0 ]; then echo '***' ; echo '***' $$p result = $$rc ; echo '***' ; fi ; \ if [ $$rc -ne 0 ]; then echo '***' $$p result = $$rc >> tmp/test-failed ; fi ; \ done + @if [ -e tmp/test-failed ]; then echo '***' FAILED ; cat tmp/test-failed ; echo '***' ; fi -new_tests: +python_tests: -( cd ../tests ; python3 runner.py --verbose ) diff --git a/test/version_test.sh b/test/version_test.sh index c9b3cea7..81de9393 100755 --- a/test/version_test.sh +++ b/test/version_test.sh @@ -4,8 +4,13 @@ source ./functions.source ( cd "$testdir" - runTest exiv2 --verbose --version | grep -v -e ^xmlns - echo xmlns entry count: $(runTest exiv2 --verbose --version | grep -e ^xmlns | wc -l) + # Curiously the pipe into grep causes FreeBSD to core dump! + if [ $(uname) != "FreeBSD" ]; then + runTest exiv2 --verbose --version | grep -v ^xmlns + echo xmlns entry count: $(runTest exiv2 --verbose --version | grep ^xmlns | wc -l) + else + runTest exiv2 --verbose --version + fi ) # That's all Folks!