From c7185c71db8204081523ad3149a889df909ca4e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= Date: Tue, 8 Feb 2022 19:24:08 +0100 Subject: [PATCH] Move all tests depending on sample applications to bash_tests --- CMakeLists.txt | 35 ++++++++++--------- .../redmine => bash_tests}/test_easyaccess.py | 2 ++ .../test_exifprint_lint.py | 0 .../redmine => bash_tests}/test_issue_1054.py | 0 .../github => bash_tests}/test_issue_1504.py | 0 .../redmine => bash_tests}/test_issue_480.py | 0 .../github => bash_tests}/test_issue_984.py | 0 .../github => bash_tests}/test_pr_1905.py | 1 + .../test_tiff_test_program.py | 0 9 files changed, 22 insertions(+), 16 deletions(-) rename tests/{bugfixes/redmine => bash_tests}/test_easyaccess.py (98%) rename tests/{bugfixes/github => bash_tests}/test_exifprint_lint.py (100%) rename tests/{bugfixes/redmine => bash_tests}/test_issue_1054.py (100%) rename tests/{bugfixes/github => bash_tests}/test_issue_1504.py (100%) rename tests/{bugfixes/redmine => bash_tests}/test_issue_480.py (100%) rename tests/{bugfixes/github => bash_tests}/test_issue_984.py (100%) rename tests/{bugfixes/github => bash_tests}/test_pr_1905.py (95%) rename tests/{tiff_test => bash_tests}/test_tiff_test_program.py (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index c2158f77..8f65859a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,25 +110,28 @@ if( EXIV2_BUILD_SAMPLES ) WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose bash_tests ) - add_test(NAME bugfixTests - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests - COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose bugfixes - ) - 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 - ) - add_test(NAME tiffTests - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests - COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose tiff_test - ) - add_test(NAME versionTests - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests - COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose bash_tests/version_test.py - ) endif() endif() +if (Python3_Interpreter_FOUND) + add_test(NAME bugfixTests + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests + COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose bugfixes + ) + 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 + ) + add_test(NAME tiffTests + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests + COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose tiff_test + ) + add_test(NAME versionTests + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests + COMMAND cmake -E env EXIV2_BINDIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${Python3_EXECUTABLE} runner.py --verbose bash_tests/version_test.py + ) +endif() + if( EXIV2_ENABLE_NLS ) add_subdirectory( po ) endif() diff --git a/tests/bugfixes/redmine/test_easyaccess.py b/tests/bash_tests/test_easyaccess.py similarity index 98% rename from tests/bugfixes/redmine/test_easyaccess.py rename to tests/bash_tests/test_easyaccess.py index ae34bb8d..cd6d1623 100644 --- a/tests/bugfixes/redmine/test_easyaccess.py +++ b/tests/bash_tests/test_easyaccess.py @@ -6,6 +6,8 @@ import system_tests @system_tests.CopyFiles("$data_path/exiv2-empty.jpg") class EasyaccessTest(metaclass=system_tests.CaseMeta): + url = "https://github.com/Exiv2/exiv2/pull/287" + filename = "$data_path/exiv2-empty_copy.jpg" commands = [ diff --git a/tests/bugfixes/github/test_exifprint_lint.py b/tests/bash_tests/test_exifprint_lint.py similarity index 100% rename from tests/bugfixes/github/test_exifprint_lint.py rename to tests/bash_tests/test_exifprint_lint.py diff --git a/tests/bugfixes/redmine/test_issue_1054.py b/tests/bash_tests/test_issue_1054.py similarity index 100% rename from tests/bugfixes/redmine/test_issue_1054.py rename to tests/bash_tests/test_issue_1054.py diff --git a/tests/bugfixes/github/test_issue_1504.py b/tests/bash_tests/test_issue_1504.py similarity index 100% rename from tests/bugfixes/github/test_issue_1504.py rename to tests/bash_tests/test_issue_1504.py diff --git a/tests/bugfixes/redmine/test_issue_480.py b/tests/bash_tests/test_issue_480.py similarity index 100% rename from tests/bugfixes/redmine/test_issue_480.py rename to tests/bash_tests/test_issue_480.py diff --git a/tests/bugfixes/github/test_issue_984.py b/tests/bash_tests/test_issue_984.py similarity index 100% rename from tests/bugfixes/github/test_issue_984.py rename to tests/bash_tests/test_issue_984.py diff --git a/tests/bugfixes/github/test_pr_1905.py b/tests/bash_tests/test_pr_1905.py similarity index 95% rename from tests/bugfixes/github/test_pr_1905.py rename to tests/bash_tests/test_pr_1905.py index 5322cc88..9cf6091d 100644 --- a/tests/bugfixes/github/test_pr_1905.py +++ b/tests/bash_tests/test_pr_1905.py @@ -6,6 +6,7 @@ class TestExifTagsInTaglist(metaclass=CaseMeta): # The taglist program outputs lots of data on all Exif tags. # Extract only the keys and compare + url = "https://github.com/Exiv2/exiv2/pull/1905/files" filename = "$tmp_path/TestExifTagsInTaglist.txt" commands = ["$taglist Exif > $filename", "cut -d, -f5 $filename"] diff --git a/tests/tiff_test/test_tiff_test_program.py b/tests/bash_tests/test_tiff_test_program.py similarity index 100% rename from tests/tiff_test/test_tiff_test_program.py rename to tests/bash_tests/test_tiff_test_program.py