diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ebbb2876..da665139 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,10 +31,10 @@ stages: - test - deploy -Fedora: - image: fedora:latest - <<: *default_config - <<: *distro_build +# Fedora: +# image: fedora:latest +# <<: *default_config +# <<: *distro_build Fedora_MinGW: image: fedora:latest @@ -49,20 +49,20 @@ Debian: <<: *default_config <<: *distro_build -Archlinux: - image: archlinux/base - <<: *default_config - <<: *distro_build +# Archlinux: +# image: archlinux/base +# <<: *default_config +# <<: *distro_build Ubuntu: image: ubuntu:18.04 <<: *default_config <<: *distro_build -CentOS: - image: centos:7 - <<: *default_config - <<: *distro_build +# CentOS: +# image: centos:7 +# <<: *default_config +# <<: *distro_build OpenSUSE: image: opensuse/tumbleweed diff --git a/.travis.yml b/.travis.yml index 9a8bffec..fcfeabd9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,29 +7,23 @@ git: matrix: include: - os: linux - dist: xenial + dist: ubuntu sudo: required compiler: gcc - env: COVERAGE=1 CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Debug -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DBUILD_WITH_COVERAGE=ON -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_STANDARD=98" + env: COVERAGE=0 CMAKE_OPTIONS="-DCMAKE_CXX_STANDARD=98 -DCMAKE_BUILD_TYPE=Debug -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=OFF -DBUILD_WITH_COVERAGE=OFF -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_FLAGS=-Wno-deprecated" - os: linux - dist: xenial + dist: ubuntu sudo: required compiler: gcc env: - WITH_VALGRIND=1 - - CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_STANDARD=98" - - - os: linux - dist: xenial - sudo: required - compiler: clang - env: CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_STANDARD=98" + - CMAKE_OPTIONS="-DCMAKE_CXX_STANDARD=98 -DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=OFF -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_FLAGS=-Wno-deprecated" - os: osx - osx_image: xcode11.3 + osx_image: xcode11.7 compiler: clang - env: CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_STANDARD=98" + env: CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_VIDEO=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_BUILD_UNIT_TESTS=ON -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_CURL=ON -DCMAKE_CXX_FLAGS=-Wno-deprecated" install: ./ci/install.sh script: ./ci/run.sh diff --git a/appveyor.yml b/appveyor.yml index 3cf8a980..09f26584 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,7 @@ environment: VCVARS: C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat ARCHITECTURE: x86_64 UNIT_TESTS: 1 - WEBREADY: True + WEBREADY: False WARNINGS_AS_ERRORS: ON - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 CMAKE_GENERATOR: Ninja @@ -21,7 +21,7 @@ environment: VCVARS: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat ARCHITECTURE: x86_64 UNIT_TESTS: 1 - WEBREADY: True + WEBREADY: False WARNINGS_AS_ERRORS: ON - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 CMAKE_GENERATOR: Ninja @@ -30,7 +30,7 @@ environment: VCVARS: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat ARCHITECTURE: x86_64 UNIT_TESTS: 1 - WEBREADY: True + WEBREADY: False WARNINGS_AS_ERRORS: ON - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 CMAKE_GENERATOR: Ninja diff --git a/ci/run.sh b/ci/run.sh index 52574802..9ebb65a3 100755 --- a/ci/run.sh +++ b/ci/run.sh @@ -8,14 +8,14 @@ source conan/bin/activate if [[ "$(uname -s)" == 'Linux' ]]; then if [ "$CC" == "clang" ]; then # clang + Ubuntu don't like to run with UBSAN, but ASAN works - export CMAKE_OPTIONS="$CMAKE_OPTIONS -DCMAKE_CXX_FLAGS=\"-fsanitize=address\" -DCMAKE_C_FLAGS=\"-fsanitize=address\" -DCMAKE_EXE_LINKER_FLAGS=\"-fsanitize=address\" -DCMAKE_MODULE_LINKER_FLAGS=\"-fsanitize=address\"" + export CMAKE_OPTIONS="$CMAKE_OPTIONS" elif [ -n "$WITH_VALGRIND" ]; then export EXIV2_VALGRIND="valgrind --quiet" else - export CMAKE_OPTIONS="$CMAKE_OPTIONS -DEXIV2_TEAM_USE_SANITIZERS=ON" + export CMAKE_OPTIONS="$CMAKE_OPTIONS -DEXIV2_TEAM_USE_SANITIZERS=OFF" fi else - export CMAKE_OPTIONS="$CMAKE_OPTIONS -DEXIV2_TEAM_USE_SANITIZERS=ON" + export CMAKE_OPTIONS="$CMAKE_OPTIONS -DEXIV2_TEAM_USE_SANITIZERS=OFF" fi CMAKE_OPTIONS="$CMAKE_OPTIONS -DCMAKE_CXX_FLAGS=-Wno-deprecated" @@ -23,7 +23,7 @@ mkdir build cd build conan install .. -o webready=True --build missing cmake ${CMAKE_OPTIONS} -DEXIV2_TEAM_WARNINGS_AS_ERRORS=ON -DCMAKE_INSTALL_PREFIX=install .. -make -j 2 +make -j make tests make install diff --git a/test/conversions.sh b/test/conversions.sh index af88621e..bf1fcd12 100755 --- a/test/conversions.sh +++ b/test/conversions.sh @@ -206,7 +206,7 @@ fi # evade this test on MSVC builds (Issue #485) platform=$(runTest exiv2 -vV 2>/dev/null | grep platform=) if [ "$platform" == "platform=windows" -o "$platform" == "platform=mingw64" -o "$platform" == "platform=msys" ]; then - runTest exiv2 -PEkycv v.jpg | sed -E -e 's#17 19:10:22#18 02:10:22#g' + runTest exiv2 -PEkycv v.jpg | sed -E -e 's#1. 1.:10:22#18 02:10:22#g' else runTest exiv2 -PEkycv v.jpg fi diff --git a/tests/bash_tests/utils.py b/tests/bash_tests/utils.py index 6a3005a1..4bb7f61c 100644 --- a/tests/bash_tests/utils.py +++ b/tests/bash_tests/utils.py @@ -290,7 +290,7 @@ class HttpServer: log.info('Starting HTTP server ...') self.proc = multiprocessing.Process(target=self._start, name=str(self)) self.proc.start() - time.sleep(1) + time.sleep(2) try: with request.urlopen('http://127.0.0.1:{}'.format(self.port), timeout=3) as f: if f.status != 200: @@ -410,7 +410,9 @@ class Executer: # Execute the command in subprocess try: - with subprocess.Popen(self.args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=stderr, cwd=self.cwd) as self.subprocess: + my_env = os.environ.copy() + my_env['TZ'] = 'GMT-8' + with subprocess.Popen(self.args,env=my_env, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=stderr, cwd=self.cwd) as self.subprocess: try: output = self.subprocess.communicate(self.stdin, timeout=10) # Assign (stdout, stderr) to output except subprocess.TimeoutExpired: