[#3350] install googletest packages in hammer

diff --git a/hammer.py b/hammer.py
index 10ff6f0c938b934d3cf9d8acbba270392d8f86d3..d9158fdae23f5a4662533861e4473c1307cd39aa 100755 (executable)
--- a/hammer.py
+++ b/hammer.py
@@ -1690,12 +1690,10 @@ def install_packages_local(system, revision, features, check_times, ignore_error
         if 'netconf' in features:
             packages.extend(['cmake', 'git', 'pcre2-devel'])
 
-        install_pkgs(packages, timeout=300, env=env, check_times=check_times)
-
         if 'unittest' in features:
-            if int(revision) >= 37:
-                install_pkgs(['flex', 'bison'], timeout=300, env=env, check_times=check_times)
-            _install_gtest_sources()
+            packages.append('gtest')
+
+        install_pkgs(packages, timeout=300, env=env, check_times=check_times)
 
         execute('sudo dnf clean packages', env=env, check_times=check_times)
 
@@ -1746,8 +1744,7 @@ def install_packages_local(system, revision, features, check_times, ignore_error
             packages.extend(['cmake', 'git', 'pcre2-devel'])
 
         if 'unittest' in features:
-            packages.append('wget')
-            deferred_functions.append(_install_gtest_sources)
+            packages.append('gtest')
 
         install_pkgs(packages, env=env, check_times=check_times)
 
@@ -1798,8 +1795,11 @@ def install_packages_local(system, revision, features, check_times, ignore_error
             packages.extend(['cmake', 'git', 'pcre2-devel'])
 
         if 'unittest' in features:
-            packages.append('wget')
-            deferred_functions.append(_install_gtest_sources)
+            if revision == '8':
+                packages.append('wget')
+                deferred_functions.append(_install_gtest_sources)
+            else:
+                packages.append('gtest')
 
         install_pkgs(packages, env=env, timeout=120, check_times=check_times)
 
@@ -1833,8 +1833,7 @@ def install_packages_local(system, revision, features, check_times, ignore_error
             packages.extend(['cmake', 'git', 'pcre2-devel'])
 
         if 'unittest' in features:
-            packages.append('wget')
-            deferred_functions.append(_install_gtest_sources)
+            packages.append('gtest')
 
         execute('sudo dnf config-manager --set-enabled crb')
         install_pkgs(packages, env=env, timeout=120, check_times=check_times)
@@ -1851,10 +1850,7 @@ def install_packages_local(system, revision, features, check_times, ignore_error
                              'texlive', 'texlive-latex-extra', 'tex-gyre'])
 
         if 'unittest' in features:
-            if revision.startswith('16.'):
-                _install_gtest_sources()
-            else:
-                packages.append('googletest')
+            packages.append('googletest')
 
         if 'native-pkg' in features:
             packages.extend(['build-essential', 'fakeroot', 'devscripts'])
@@ -1901,11 +1897,7 @@ def install_packages_local(system, revision, features, check_times, ignore_error
                              'tex-gyre', 'texlive', 'texlive-latex-extra'])
 
         if 'unittest' in features:
-            if revision == '8':
-                # libgtest-dev does not work and googletest is not available
-                _install_gtest_sources()
-            else:
-                packages.append('googletest')
+            packages.append('googletest')
 
         if 'netconf' in features:
             packages.extend(['cmake', 'git', 'libpcre2-dev'])
@@ -1991,7 +1983,7 @@ def install_packages_local(system, revision, features, check_times, ignore_error
         install_pkgs(packages, env=env, timeout=6 * 60, check_times=check_times)
 
         if 'unittest' in features:
-            _install_gtest_sources()
+            packages.append(['googletest'])
 
         if 'mysql' in features:
             execute('sudo sysrc mysql_enable="yes"', env=env, check_times=check_times)
@@ -2012,7 +2004,7 @@ def install_packages_local(system, revision, features, check_times, ignore_error
             packages.extend(['py3-sphinx py3-sphinx_rtd_theme'])
 
         if 'unittest' in features:
-            _install_gtest_sources()
+            packages.append('gtest')
 
         if 'netconf' in features:
             packages.extend(['cmake', 'git', 'pcre2-dev'])