Merge pull request #1289 from kmilos/0.27-rm-exiv2_ext

Remove EXIV2_EXT variable references

README-CONAN.md

@@ -181,7 +181,6 @@ set "P=%P%c:\Windows\System32;"              # windows
 set "P=%P%%USERPROFILE%\com;"                # my home-made magic
 echo %P%
 set "PATH=%P%"
-set "EXIV2_EXT=.exe"
 set "EXIV2_BINDIR=%USERPROFILE%\gnu\github\exiv2\0.27-maintenance\build\bin"
 color 0d
 cmd /S /K cd "%EXIV2_BINDIR%\..\.."

README.md

@@ -708,7 +708,6 @@ On MinGW/msys2, I can directly access the share:
 ```bash
 $ cd //Mac/Home/gnu/github/exiv2/0.27/maintenance/build_mingw_fedora
 $ export EXIV2_BINDIR=$pwd/bin
-$ export EXIV2_EXT=.exe
 $ cd ../test
 $ make tests
 ```
@@ -833,8 +832,6 @@ If you build the code in the directory \<exiv2dir\>build, tests will run using t
 | EXIV2_BINDIR       | **\<exiv2dir\>/build/bin** | All Platforms | Path of built binaries (exiv2.exe) |
 | EXIV2_PORT         | **12762**<br>**12671**<br>**12760**  | Cygwin<br>MinGW/msys2<br>Other Platforms | Test TCP/IP Port   |
 | EXIV2_HTTP         | **http://localhost**  | All Platforms | Test http server   |
-| EXIV2_EXT          | **.exe**  | msvc<br>Cygwin<br>MinGW/msys2 | Extension used by executable binaries |
-| EXIV2_EXT          | _**not set**_  | Linux<br>macOS<br>Unix|  |
 | EXIV2_ECHO         | _**not set**_ | All Platforms | For debugging Bash scripts |
 | VALGRIND           | _**not set**_ | All Platforms | For debugging Bash scripts |
 | VERBOSE            | _**not set**_ | All Platforms | Causes make to report its actions |
@@ -1190,7 +1187,6 @@ set "P=%P%c:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild
 set "P=%P%c:\Windows\System32;"              # windows
 set "P=%P%%USERPROFILE%\com;"                # my home-made magic
 set "PATH=%P%"
-set "EXIV2_EXT=.exe"
 cmd /S /K cd "%USERPROFILE%\gnu\github\exiv2\0.27-maintenance\"
 endlocal
 ```

appveyor.yml

@@ -79,7 +79,6 @@ build_script:
     - cmd: cd bin
     - cmd: if %UNIT_TESTS% == 1 unit_tests.exe
     - cmd: cd ../../tests/
-    - cmd: set EXIV2_EXT=.exe
     - cmd: if %INTEGRATION_TESTS% == 1 %PYTHON%/python.exe runner.py -v
     - cmd: cd ../build/bin
     - cmd: exiv2 --version --verbose

test/functions.source

@@ -427,10 +427,6 @@ prepareTest()
         exe=.exe
     fi
 
-    if [ ! -z $EXIV2_EXT ]; then
-        exe=$EXIV2_EXT
-    fi
-
     ##
     # initialize globals
     this=$(basename $0 .sh)

tests/bugfixes/github/test_issue_1099.py

@@ -18,7 +18,7 @@ class EmptyValueInCommandFile(metaclass=CaseMeta):
 
     stderr = [
         """$filename1, line 1: Empty value for key `Exiff.LfkInfo.GPSDa'
-$exiv2exe: Error parsing -m option arguments
+exiv2: Error parsing -m option arguments
 """]
     retval = [1]
 

tests/suite.conf

@@ -4,7 +4,6 @@ memcheck: ${ENV:valgrind}
 
 [ENV]
 exiv2_path: EXIV2_BINDIR
-binary_extension: EXIV2_EXT
 valgrind: EXIV2_VALGRIND
 exiv2_http: EXIV2_HTTP
 exiv2_port: EXIV2_PORT
@@ -15,14 +14,14 @@ exiv2_http: http://127.0.0.1
 exiv2_port: 12760
 
 [paths]
-exiv2: ${ENV:exiv2_path}/exiv2${ENV:binary_extension}
-exiv2json: ${ENV:exiv2_path}/exiv2json${ENV:binary_extension}
+exiv2: ${ENV:exiv2_path}/exiv2
+exiv2json: ${ENV:exiv2_path}/exiv2json
 data_path: ../test/data
 tmp_path: ../test/tmp
-tiff_test: ${ENV:exiv2_path}/tiff-test${ENV:binary_extension}
-largeiptc_test: ${ENV:exiv2_path}/largeiptc-test${ENV:binary_extension}
-easyaccess_test: ${ENV:exiv2_path}/easyaccess-test${ENV:binary_extension}
-taglist: ${ENV:exiv2_path}/taglist${ENV:binary_extension}
+tiff_test: ${ENV:exiv2_path}/tiff-test
+largeiptc_test: ${ENV:exiv2_path}/largeiptc-test
+easyaccess_test: ${ENV:exiv2_path}/easyaccess-test
+taglist: ${ENV:exiv2_path}/taglist
 
 [variables]
 kerOffsetOutOfRange: Offset out of range
@@ -34,7 +33,6 @@ kerInvalidTypeValue: invalid type in tiff structure
 kerNotAJpeg : This does not look like a JPEG image
 kerNoImageInInputData: Input data does not contain a valid image
 addition_overflow_message: Overflow in addition
-exiv2exe: exiv2${ENV:binary_extension}
 exiv2_exception_message: Exiv2 exception in print action for file
 exiv2_overflow_exception_message: std::overflow_error exception in print action for file
 exception_in_extract: Exiv2 exception in extract action for file

tests/system_tests.py

@@ -10,7 +10,6 @@ import sys
 import shutil
 import string
 import unittest
-import platform
 
 
 from bash_tests import utils as BT
@@ -162,8 +161,6 @@ def configure_suite(config_file):
         else:
             fallback = ""
         config['ENV'][key] = os.getenv(config['ENV'][key]) or fallback
-    if platform.system() == 'Windows':
-        config['ENV']['binary_extension'] = config['ENV']['binary_extension'] or '.exe'
 
     if 'variables' in config:
         for key in config['variables']:
@@ -177,7 +174,7 @@ def configure_suite(config_file):
             )
             if key == "tmp_path" and not os.path.isdir(abs_path):
                 os.mkdir(abs_path)
-            if not os.path.exists(abs_path):
+            if key == "data_path" and not os.path.exists(abs_path):
                 raise ValueError(
                     "Path replacement for {short}: {abspath} does not exist"
                     " (was expanded from {rel})".format(