bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Check in fused GTest files

Browse Source 
The fuse_gtest_files.py script was removed from GTest in
https://github.com/google/googletest/commit/47f819c3ca.
Consequently we can no longer generate these files at runtime.
This commit is contained in:
Marshall Greenblatt
2021-08-24 17:13:10 -04:00
parent cf4457bbb3
commit 92f67ee847
5 changed files with 24927 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tools/make_distrib.py
View File

@ -174,43 +174,35 @@ def create_readme():
sys.stdout.write('Creating README.TXT file.\n')
def create_fuzed_gtest(tests_dir):
""" Generate a fuzed version of gtest and build the expected directory structure. """
src_gtest_dir = os.path.join(src_dir, 'third_party', 'googletest', 'src',
'googletest')
run('%s fuse_gtest_files.py \"%s\"' % (sys.executable, tests_dir),
os.path.join(src_gtest_dir, 'scripts'))
def copy_gtest(tests_dir):
""" Copy GTest files to the expected directory structure. """
if not options.quiet:
sys.stdout.write('Building gtest directory structure.\n')
src_gtest_dir = os.path.join(cef_dir, 'tools', 'distrib', 'gtest')
target_gtest_dir = os.path.join(tests_dir, 'gtest')
gtest_header = os.path.join(target_gtest_dir, 'gtest.h')
gtest_cpp = os.path.join(target_gtest_dir, 'gtest-all.cc')
if not os.path.exists(gtest_header):
raise Exception('Generated file not found: %s' % gtest_header)
if not os.path.exists(gtest_cpp):
raise Exception('Generated file not found: %s' % gtest_cpp)
# gtest header file at tests/gtest/include/gtest/gtest.h
target_gtest_header_dir = os.path.join(target_gtest_dir, 'include', 'gtest')
make_dir(target_gtest_header_dir, options.quiet)
move_file(gtest_header, target_gtest_header_dir, options.quiet)
copy_file(
os.path.join(src_gtest_dir, 'gtest.h'), target_gtest_header_dir,
options.quiet)
# gtest source file at tests/gtest/src/gtest-all.cc
target_gtest_cpp_dir = os.path.join(target_gtest_dir, 'src')
make_dir(target_gtest_cpp_dir, options.quiet)
move_file(gtest_cpp, target_gtest_cpp_dir, options.quiet)
copy_file(
os.path.join(src_gtest_dir, 'gtest-all.cc'), target_gtest_cpp_dir,
options.quiet)
# gtest LICENSE file at tests/gtest/LICENSE
copy_file(
os.path.join(src_gtest_dir, os.pardir, 'LICENSE'), target_gtest_dir,
options.quiet)
os.path.join(src_gtest_dir, 'LICENSE'), target_gtest_dir, options.quiet)
# CEF README file at tests/gtest/README.cef
copy_file(
os.path.join(cef_dir, 'tests', 'gtest', 'README.cef.in'),
os.path.join(src_gtest_dir, 'README.cef'),
os.path.join(target_gtest_dir, 'README.cef'), options.quiet)
# Copy tests/gtest/teamcity files
@ -824,8 +816,8 @@ if mode == 'standard':
transfer_gypi_files(cef_dir, cef_paths2['ceftests_sources_common'], \
'tests/ceftests/', ceftests_dir, options.quiet)
# create the fuzed gtest version
create_fuzed_gtest(tests_dir)
# copy GTest files
copy_gtest(tests_dir)
# process cmake templates
if not options.ozone: