refactor: small cleanup of test infra to avoid duplicate runs
This commit is contained in:
parent
4323965c0a
commit
08975e3dfc
@ -107,15 +107,19 @@ if( EXIV2_BUILD_SAMPLES )
|
|||||||
if (Python3_Interpreter_FOUND)
|
if (Python3_Interpreter_FOUND)
|
||||||
add_test(NAME bashTests
|
add_test(NAME bashTests
|
||||||
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests
|
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests
|
||||||
COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py bash_tests/testcases.py --verbose
|
COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose bash_tests
|
||||||
)
|
)
|
||||||
add_test(NAME versionTests
|
add_test(NAME bugfixes
|
||||||
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests
|
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests
|
||||||
COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py bash_tests/version_test.py
|
COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose bugfixes
|
||||||
)
|
)
|
||||||
add_test(NAME pythonTests
|
add_test(NAME tiffTests
|
||||||
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests
|
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests
|
||||||
COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py
|
COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose tiff_test
|
||||||
|
)
|
||||||
|
add_test(NAME lensTests
|
||||||
|
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests
|
||||||
|
COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose lens_tests
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
@ -1,14 +0,0 @@
|
|||||||
# -*- coding: utf-8 -*-
|
|
||||||
|
|
||||||
import system_tests
|
|
||||||
import os
|
|
||||||
import unittest
|
|
||||||
|
|
||||||
bSkip=not (os.path.isfile(system_tests.unit_tests) or os.path.isfile(system_tests.unit_tests + '.exe'))
|
|
||||||
if bSkip:
|
|
||||||
msg='*** %s does not exist ***' % system_tests.unit_tests
|
|
||||||
print(msg)
|
|
||||||
raise unittest.SkipTest(msg)
|
|
||||||
|
|
||||||
system_tests.BT.runTest(system_tests.unit_tests,raw=True)
|
|
||||||
print('')
|
|
||||||
@ -1,4 +0,0 @@
|
|||||||
# -*- coding: utf-8 -*-
|
|
||||||
|
|
||||||
import system_tests
|
|
||||||
system_tests.BT.verbose_version(True)
|
|
||||||
Loading…
Reference in New Issue
Block a user