From 8a68658f1809921e7c9e61793be46f34a81de81c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?= Date: Wed, 9 Sep 2020 11:25:44 +0200 Subject: [PATCH] Remove EXIV2_EXT variable references --- README-CONAN.md | 1 - README.md | 4 ---- appveyor.yml | 1 - test/functions.source | 4 ---- tests/suite.conf | 2 +- 5 files changed, 1 insertion(+), 11 deletions(-) diff --git a/README-CONAN.md b/README-CONAN.md index c69d6493..7ba3cf3b 100644 --- a/README-CONAN.md +++ b/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%\..\.." diff --git a/README.md b/README.md index fbff2b22..1abc0c5a 100644 --- a/README.md +++ b/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 \build, tests will run using t | EXIV2_BINDIR | **\/build/bin** | All Platforms | Path of built binaries (exiv2.exe) | | EXIV2_PORT | **12762**
**12671**
**12760** | Cygwin
MinGW/msys2
Other Platforms | Test TCP/IP Port | | EXIV2_HTTP | **http://localhost** | All Platforms | Test http server | -| EXIV2_EXT | **.exe** | msvc
Cygwin
MinGW/msys2 | Extension used by executable binaries | -| EXIV2_EXT | _**not set**_ | Linux
macOS
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 ``` diff --git a/appveyor.yml b/appveyor.yml index 68ce0000..3cf8a980 100644 --- a/appveyor.yml +++ b/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 diff --git a/test/functions.source b/test/functions.source index fc6c93d8..d7609a66 100644 --- a/test/functions.source +++ b/test/functions.source @@ -426,10 +426,6 @@ prepareTest() if [ "$PLATFORM" == cygwin -o "$PLATFORM" == mingw ]; then exe=.exe fi - - if [ ! -z $EXIV2_EXT ]; then - exe=$EXIV2_EXT - fi ## # initialize globals diff --git a/tests/suite.conf b/tests/suite.conf index 769b3e13..f7a7c97c 100644 --- a/tests/suite.conf +++ b/tests/suite.conf @@ -4,7 +4,7 @@ memcheck: ${ENV:valgrind} [ENV] exiv2_path: EXIV2_BINDIR -binary_extension: EXIV2_EXT +binary_extension: valgrind: EXIV2_VALGRIND exiv2_http: EXIV2_HTTP exiv2_port: EXIV2_PORT