Skip to content

Commit 51d17f4

Browse files
committed
[#3350] clean up some old revision logic in hammer
1 parent d53b242 commit 51d17f4

File tree

1 file changed

+9
-29
lines changed

1 file changed

+9
-29
lines changed

hammer.py

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1675,11 +1675,9 @@ def install_packages_local(system, revision, features, check_times, ignore_error
16751675
packages.extend(['mariadb', 'mariadb-server', 'mariadb-connector-c-devel'])
16761676

16771677
if 'pgsql' in features:
1678-
if int(revision) >= 30:
1679-
packages.extend(['postgresql-server-devel'])
16801678
if int(revision) <= 34:
16811679
packages.extend(['postgresql-devel'])
1682-
packages.extend(['postgresql-server'])
1680+
packages.extend(['postgresql-server', 'postgresql-server-devel'])
16831681

16841682
if 'gssapi' in features:
16851683
packages.extend(['krb5-devel'])
@@ -1893,16 +1891,14 @@ def link_pg_config():
18931891
'liblog4cplus-dev', 'libboost-system-dev', 'gnupg', 'bison', 'flex']
18941892

18951893
if 'docs' in features:
1896-
packages.extend(['python3-sphinx', 'python3-sphinx-rtd-theme',
1894+
packages.extend(['python3-sphinx', 'python3-sphinx-rtd-theme', 'doxygen', 'graphviz',
18971895
'tex-gyre', 'texlive', 'texlive-latex-extra'])
18981896

18991897
if 'unittest' in features:
19001898
packages.append('googletest')
19011899

19021900
if 'netconf' in features:
1903-
packages.extend(['cmake', 'git', 'libpcre2-dev'])
1904-
if revision == '12':
1905-
packages.extend(['doxygen', 'graphviz', 'pkg-config'])
1901+
packages.extend(['cmake', 'git', 'libpcre2-dev', 'pkg-config'])
19061902

19071903
if 'native-pkg' in features:
19081904
packages.extend(['build-essential', 'fakeroot', 'devscripts'])
@@ -1911,18 +1907,17 @@ def link_pg_config():
19111907
packages.extend(['dh-python'])
19121908

19131909
if 'mysql' in features:
1914-
if revision == '8':
1915-
packages.extend(['mysql-client', 'libmysqlclient-dev'])
1916-
else:
1917-
packages.extend(['default-mysql-client-core', 'default-libmysqlclient-dev'])
1918-
if revision in ['8', '9']:
1910+
packages.extend(['default-mysql-client-core', 'default-libmysqlclient-dev'])
1911+
if int(revision) <= 8:
1912+
packages.extend(['mysql-client', 'libmysqlclient-dev', 'mysql-server'])
1913+
elif int(revision) <= 9:
19191914
packages.append('mysql-server')
19201915
else:
19211916
packages.append('mariadb-server')
19221917

19231918
if 'pgsql' in features:
19241919
packages.extend(['postgresql-client', 'libpq-dev'])
1925-
if revision == '8':
1920+
if int(revision) <= 8:
19261921
packages.extend(['postgresql', 'postgresql-client'])
19271922
else:
19281923
packages.append('postgresql-all')
@@ -2113,22 +2108,7 @@ def _build_binaries_and_run_ut(system, revision, features, tarball_path, env, ch
21132108
if 'pgsql' in features:
21142109
cmd += ' --with-pgsql'
21152110
if 'unittest' in features:
2116-
# prepare gtest switch - use downloaded gtest sources only if it is not present as native package
2117-
if system in ['centos', 'fedora', 'rhel', 'freebsd', 'alpine', 'rocky']:
2118-
cmd += ' --with-gtest-source=/usr/src/googletest-release-1.10.0/googletest/'
2119-
elif system == 'debian' and revision == '8':
2120-
cmd += ' --with-gtest-source=/usr/src/googletest-release-1.10.0/googletest/'
2121-
elif system == 'debian':
2122-
cmd += ' --with-gtest-source=/usr/src/googletest/googletest'
2123-
elif system == 'ubuntu':
2124-
if revision.startswith('16.'):
2125-
cmd += ' --with-gtest-source=/usr/src/googletest-release-1.10.0/googletest/'
2126-
else:
2127-
cmd += ' --with-gtest-source=/usr/src/googletest/googletest'
2128-
elif system == 'arch':
2129-
pass
2130-
else:
2131-
raise NotImplementedError('no implementation for %s' % system)
2111+
cmd += ' --with-gtest-source=/usr/src/googletest'
21322112
if 'docs' in features and not system == 'rhel':
21332113
cmd += ' --enable-generate-docs'
21342114
if 'gssapi' in features:

0 commit comments

Comments
 (0)