xymp
/
exiv2
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

enhanced_test4_0.27

Browse Source 
a) new_tests => python_tests
b) FreeBSD grep/pipe issue in version_test
c) report summary of bash_tests
v0.27.3
clanmills 5 years ago
parent bf7796b1d2
commit 53ac282218
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File

8
CMakeLists.txt
Unescape Escape View File

@ -103,20 +103,20 @@ if( EXIV2_BUILD_SAMPLES )
add_custom_target(tests add_custom_target(tests
COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make unit_test 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 ${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 COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make version_test
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test"
) )
else() else()
add_custom_target(tests add_custom_target(tests
COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make ${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 COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make version_test
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test"
) )
endif() endif()
add_custom_target(new_tests add_custom_target(python_tests
COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make new_tests COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make python_tests
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test"
) )
add_custom_target(bash_tests add_custom_target(bash_tests

8
README.md
Unescape Escape View File

@ -742,8 +742,8 @@ There are different kinds of tests:
|:-- |:-- |:-- |:-- |:-- | |:-- |:-- |:-- |:-- |:-- |
| Run all tests | | | $ make tests | | | Run all tests | | | $ make tests | |
| Bash scripts | bash | \<exiv2dir\>/test | $ make bash_tests | -DEXIV2\_BUILD\_SAMPLES=On | | Bash scripts | bash | \<exiv2dir\>/test | $ make bash_tests | -DEXIV2\_BUILD\_SAMPLES=On |
| Python scripts | python | \<exiv2dir\>/tests | $ make new_tests | -DEXIV2\_BUILD\_SAMPLES=On | | Python scripts | python | \<exiv2dir\>/tests | $ make python_tests | -DEXIV2\_BUILD\_SAMPLES=On |
| Unit tests | C++ | \<exiv2dir\>/unitTests | $ make unit_test | -DEXIV2\_BUILD\_UNIT\_TESTS_=On | | Unit tests | C++ | \<exiv2dir\>/unitTests | $ make unit_test | -DEXIV2\_BUILD\_UNIT\_TESTS=On |
| Version test | C++ | \<exiv2dir\>/src/version.cpp | $ make version_test | Always in library | | Version test | C++ | \<exiv2dir\>/src/version.cpp | $ make version_test | Always in library |
Environment Variables used by test suite 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 ICC jpg md5 webp md5 png md5 jpg md5
all testcases passed. all testcases passed.
$ env EXIV2_BINDIR=${PWD}/../build/bin make new_tests $ env EXIV2_BINDIR=${PWD}/../build/bin make python_tests
... lots of output ... ... lots of output ...
test_run (tiff_test.test_tiff_test_program.TestTiffTestProg) ... ok 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 ```bash
$ cd <exiv2dir>/test $ cd <exiv2dir>/test
$ make tests $ make tests
$ make new_tests $ make python_tests
$ ./icc-test.sh $ ./icc-test.sh
``` ```

4
test/Makefile
Unescape Escape View File

@ -153,6 +153,7 @@ alltest:
if [ $$rc -ne 0 ]; then echo '***' ; echo '***' $$p result = $$rc ; echo '***' ; fi ; \ 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 ; \ if [ $$rc -ne 0 ]; then echo '***' $$p result = $$rc >> tmp/test-failed ; fi ; \
done done
@if [ -e tmp/test-failed ]; then echo ; echo '***' FAILED ; cat tmp/test-failed ; echo '***' ; fi
unixtest: unixtest:
@echo @echo
@ -167,8 +168,9 @@ unixtest:
if [ $$rc -ne 0 ]; then echo '***' ; echo '***' $$p result = $$rc ; echo '***' ; fi ; \ 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 ; \ if [ $$rc -ne 0 ]; then echo '***' $$p result = $$rc >> tmp/test-failed ; fi ; \
done 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 ) -( cd ../tests ; python3 runner.py --verbose )

9
test/version_test.sh
Unescape Escape View File

@ -4,8 +4,13 @@
source ./functions.source source ./functions.source
( cd "$testdir" ( cd "$testdir"
runTest exiv2 --verbose --version | grep -v -e ^xmlns # Curiously the pipe into grep causes FreeBSD to core dump!
echo xmlns entry count: $(runTest exiv2 --verbose --version | grep -e ^xmlns | wc -l) 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! # That's all Folks!

Write Preview
Loading…
Cancel
Save