• Adam Cozzette's avatar
    Fix Windows builds with future Bazel changes · a0a8c6cd
    Adam Cozzette authored
    The bazel-bin/ and bazel-genfiles/ directories are going to be merged
    soon. That change was causing some test failures on Windows, and I
    believe it is because the logic for locating test data files was getting
    confused and mistakenly looking for them under bazel-bin/. This commit
    updates that logic to look for a more specific file (descriptor.cc)
    which does not appear under any Bazel-related directories.
    
    It sounds like the more official solution is to use the Bazel runfiles
    library (i.e. //tools/cpp/runfiles). However, I decided not to do that
    because we currently still support multiple build systems, and if we
    used a separate solution for Bazel then I suspect we would need even
    more #ifdefs in the code to handle the different systems.
    a0a8c6cd
Name
Last commit
Last update
.github/ISSUE_TEMPLATE Loading commit data...
benchmarks Loading commit data...
cmake Loading commit data...
conformance Loading commit data...
csharp Loading commit data...
docs Loading commit data...
editors Loading commit data...
examples Loading commit data...
java Loading commit data...
js Loading commit data...
kokoro Loading commit data...
m4 Loading commit data...
objectivec Loading commit data...
php Loading commit data...
protoc-artifacts Loading commit data...
python Loading commit data...
ruby Loading commit data...
src Loading commit data...
third_party Loading commit data...
util/python Loading commit data...
.gitignore Loading commit data...
.gitmodules Loading commit data...
BUILD Loading commit data...
CHANGES.txt Loading commit data...
CONTRIBUTING.md Loading commit data...
CONTRIBUTORS.txt Loading commit data...
LICENSE Loading commit data...
Makefile.am Loading commit data...
Protobuf.podspec Loading commit data...
README.md Loading commit data...
WORKSPACE Loading commit data...
appveyor.bat Loading commit data...
appveyor.yml Loading commit data...
autogen.sh Loading commit data...
compiler_config_setting.bzl Loading commit data...
composer.json Loading commit data...
configure.ac Loading commit data...
generate_changelog.py Loading commit data...
generate_descriptor_proto.sh Loading commit data...
global.json Loading commit data...
post_process_dist.sh Loading commit data...
protobuf-lite.pc.in Loading commit data...
protobuf.bzl Loading commit data...
protobuf.pc.in Loading commit data...
protobuf_deps.bzl Loading commit data...
six.BUILD Loading commit data...
tests.sh Loading commit data...
update_file_lists.sh Loading commit data...
update_version.py Loading commit data...