]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[#3393] ignore error in libyang tests
authorAndrei Pavel <andrei@isc.org>
Fri, 17 May 2024 05:47:55 +0000 (08:47 +0300)
committerAndrei Pavel <andrei@isc.org>
Fri, 17 May 2024 05:47:55 +0000 (08:47 +0300)
... and add bison and flex to ubuntu for completion

hammer.py

index e3ff456ec2914d8d04951213f6cf1a5dfbf9db71..584852c0c47d566d01c307ea447c8260d71fbfbc 100755 (executable)
--- a/hammer.py
+++ b/hammer.py
@@ -1133,7 +1133,7 @@ def _install_libyang_from_sources(ignore_errors = False):
         execute('git clone https://github.com/CESNET/libyang.git ~/.hammer-tmp/libyang')
         execute(f'git checkout {version}', cwd='~/.hammer-tmp/libyang')
         execute('mkdir ~/.hammer-tmp/libyang/build')
-        execute('cmake  ..', cwd='~/.hammer-tmp/libyang/build')
+        execute('cmake -DBUILD_TESTING=OFF -DCMAKE_C_FLAGS="-Wno-incompatible-pointer-types" ..', cwd='~/.hammer-tmp/libyang/build')
         execute('make -j $(nproc || gnproc || echo 1)', cwd='~/.hammer-tmp/libyang/build')
         execute('sudo make install', cwd='~/.hammer-tmp/libyang/build')
         system, revision = get_system_revision()
@@ -1169,7 +1169,7 @@ def _install_sysrepo_from_sources(ignore_errors = False):
         execute('git clone https://github.com/sysrepo/sysrepo.git ~/.hammer-tmp/sysrepo')
         execute(f'git checkout {version}', cwd='~/.hammer-tmp/sysrepo')
         execute('mkdir ~/.hammer-tmp/sysrepo/build')
-        execute('cmake -DREPO_PATH=/etc/sysrepo ..', cwd='~/.hammer-tmp/sysrepo/build')
+        execute('cmake -DBUILD_TESTING=OFF -DREPO_PATH=/etc/sysrepo ..', cwd='~/.hammer-tmp/sysrepo/build')
         execute('make -j $(nproc || gnproc || echo 1)', cwd='~/.hammer-tmp/sysrepo/build')
         execute('sudo make install', cwd='~/.hammer-tmp/sysrepo/build')
         system, revision = get_system_revision()
@@ -1847,7 +1847,7 @@ def install_packages_local(system, revision, features, check_times, ignore_error
         _apt_update(system, revision, env=env, check_times=check_times, attempts=3, sleep_time_after_attempt=10)
 
         packages = ['gcc', 'g++', 'make', 'autoconf', 'automake', 'libtool', 'libssl-dev', 'liblog4cplus-dev',
-                    'libboost-system-dev', 'gnupg', 'libpcap-dev']
+                    'libboost-system-dev', 'gnupg', 'libpcap-dev', 'bison', 'flex']
 
         if 'docs' in features:
             packages.extend(['python3-sphinx', 'python3-sphinx-rtd-theme',