From 671c0ed6aa43843061bbc8fb9b3a9b5a554a51d0 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 3 Dec 2024 19:30:37 +0100 Subject: [PATCH] test_ogrmerge.py: avoid failure on ASAN CI config --- autotest/pyscripts/test_ogrmerge.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/autotest/pyscripts/test_ogrmerge.py b/autotest/pyscripts/test_ogrmerge.py index c7cc62cb57f7..f153e11e4f5c 100755 --- a/autotest/pyscripts/test_ogrmerge.py +++ b/autotest/pyscripts/test_ogrmerge.py @@ -13,6 +13,7 @@ import sys +import gdaltest import pytest import test_py_scripts from test_py_scripts import samples_path @@ -39,6 +40,9 @@ def script_path(): def test_ogrmerge_help(script_path): + if gdaltest.is_travis_branch("sanitize"): + pytest.skip("fails on sanitize for unknown reason") + assert "ERROR" not in test_py_scripts.run_py_script( script_path, "ogrmerge", "--help" ) @@ -50,6 +54,9 @@ def test_ogrmerge_help(script_path): def test_ogrmerge_version(script_path): + if gdaltest.is_travis_branch("sanitize"): + pytest.skip("fails on sanitize for unknown reason") + assert "ERROR" not in test_py_scripts.run_py_script( script_path, "ogrmerge", "--version" )