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

Replace make test with make bash_tests because CMake/Linux refuses a target called 'test'

Browse Source
v0.27.3
clanmills 5 years ago
parent 0f3dd2e9ed
commit 35a0627b76
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File

10
CMakeLists.txt
Unescape Escape View File

@ -103,23 +103,23 @@ 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 newtests COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make new_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 newtests COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make new_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(newtests add_custom_target(new_tests
COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make newtests COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make new_tests
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test"
) )
add_custom_target(test add_custom_target(bash_tests
COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make ${TEST} COMMAND env EXIV2_BINDIR="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" make ${TEST}
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test"
) )

14
README.md
Unescape Escape View File

@ -689,7 +689,7 @@ $ cd //Mac/Home/gnu/github/exiv2/0.27/maintenance/build_mingw_fedora
$ export EXIV2_BINDIR=$pwd/bin $ export EXIV2_BINDIR=$pwd/bin
$ export EXIV2_EXT=.exe $ export EXIV2_EXT=.exe
$ cd ../test $ cd ../test
$ make test $ make tests
``` ```
You will find that 3 tests fail at the end of the test suite. It is safe to ignore those minor exceptions. You will find that 3 tests fail at the end of the test suite. It is safe to ignore those minor exceptions.
@ -741,8 +741,8 @@ There are different kinds of tests:
| Description | Language | Location | Command<br>_(in build or test directory)_ | CMake Option to Build | | Description | Language | Location | Command<br>_(in build or test directory)_ | CMake Option to Build |
|:-- |:-- |:-- |:-- |:-- | |:-- |:-- |:-- |:-- |:-- |
| Run all tests | | | $ make tests | | | Run all tests | | | $ make tests | |
| Bash scripts | bash | \<exiv2dir\>/test | $ make test | -DEXIV2\_BUILD\_SAMPLES=On | | Bash scripts | bash | \<exiv2dir\>/test | $ make bash_tests | -DEXIV2\_BUILD\_SAMPLES=On |
| Python scripts | python | \<exiv2dir\>/tests | $ make newtests | -DEXIV2\_BUILD\_SAMPLES=On | | Python scripts | python | \<exiv2dir\>/tests | $ make new_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 |
@ -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 newtests $ env EXIV2_BINDIR=${PWD}/../build/bin make new_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
---------------------------------------------------------------------- ----------------------------------------------------------------------
@ -813,8 +813,8 @@ Once you have modified the PATH and exported EXIV2\_BINDIR and EXIV2\_EXT, you c
```bash ```bash
$ cd <exiv2dir>/test $ cd <exiv2dir>/test
$ make test $ make tests
$ make newtests $ make new_tests
$ ./icc-test.sh $ ./icc-test.sh
``` ```
@ -1073,4 +1073,4 @@ $ sudo pkg install developer/gcc-7
[TOC](#TOC) [TOC](#TOC)
Written by Robin Mills<br>robin@clanmills.com<br>Updated: 2020-04-18 Written by Robin Mills<br>robin@clanmills.com<br>Updated: 2020-04-19

4
test/Makefile
Unescape Escape View File

@ -136,7 +136,7 @@ xmpparser-test:
version_test \ version_test \
unit_test \ unit_test \
test \ bash_tests \
tests: tests:
@./$@.sh @./$@.sh
@ -168,7 +168,7 @@ unixtest:
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
newtests: new_tests:
( cd ../tests ; python3 runner.py --verbose ) ( cd ../tests ; python3 runner.py --verbose )

6
test/bash_tests.sh
Unescape Escape View File

@ -0,0 +1,6 @@
#!/usr/bin/env bash
( source ./functions.source ; cd "$bin/.." ; make bash_tests )
# That's all Folks!
##

6
test/test.sh
Unescape Escape View File

@ -1,6 +0,0 @@
#!/usr/bin/env bash
( source ./functions.source ; cd "$bin/.." ; make test )
# That's all Folks!
##
Write Preview
Loading…
Cancel
Save