← Back to branch summary

~ubuntu-branches/ubuntu/maverick/protobuf/maverick

~ubuntu-branches/ubuntu/maverick/protobuf/maverick

« back to all changes in this revision

Viewing changes to src/google/protobuf/compiler/importer_unittest.cc

Committer: Bazaar Package Importer
Author(s): Manny Vindiola
Date: 2008-12-18 01:26:29 UTC
mfrom: (1.1.2 upstream)
Revision ID: james.westby@ubuntu.com-20081218012629-l93kqt3jptydn9zh

Tags: 2.0.3-0ubuntu1

https://launchpad.net/bugs/309237

https://launchpad.net/bugs/308829

* Merge from new upstream version (LP: #309237), remaining changes:
   * debian/control Moving python-support from Build-Depends-Indep
     to Build-Depends to fix build failures.
* Fix FTBFS on ia64 architecture due to lack of clone(2)
   - src/gtest/internal/gtest-port.h (LP: #308829)
     disable death tests if architecture is IA64
     adapted from gtest upstream fix at:
     http://codereview.appspot.com/8690/show
* Fix FTBFS on x64 architectures due to python 2.x int vs long issue
  test expects return type long but on x64 architecture return type
  unpacks to int
   -python/google/protobuf/internal/decoder_test.py
    explicitly type the result value as long
   taken from upstream discussion:
   http://groups.google.com/group/protobuf/browse_thread
       /thread/2357176cb1f50e10/

files added:
debian/libprotobuf3.install

debian/libprotobuf3.postinst

debian/libprotobuf3.postrm

m4/ac_system_extensions.m4

m4/libtool.m4

m4/ltoptions.m4

m4/ltsugar.m4

m4/ltversion.m4

m4/lt~obsolete.m4

python/google/protobuf/internal/containers.py

src/google/protobuf/stubs/structurally_valid.cc

src/google/protobuf/stubs/structurally_valid_unittest.cc

files removed:
debian/libprotobuf2.install

debian/libprotobuf2.postinst

debian/libprotobuf2.postrm

files modified:
CHANGES.txt

CONTRIBUTORS.txt

Makefile.am

Makefile.in

README.txt

aclocal.m4

config.h.in

configure

configure.ac

debian/changelog

debian/control

debian/java-build.xml

debian/libprotobuf-java.links

debian/protoc.xml

debian/rules

examples/list_people.py

generate_descriptor_proto.sh

java/pom.xml

java/src/main/java/com/google/protobuf/AbstractMessage.java

java/src/main/java/com/google/protobuf/ByteString.java

java/src/main/java/com/google/protobuf/CodedInputStream.java

java/src/main/java/com/google/protobuf/GeneratedMessage.java

java/src/main/java/com/google/protobuf/Message.java

java/src/test/java/com/google/protobuf/CodedInputStreamTest.java

java/src/test/java/com/google/protobuf/GeneratedMessageTest.java

java/src/test/java/com/google/protobuf/WireFormatTest.java

ltmain.sh *

python/google/protobuf/internal/decoder_test.py

python/google/protobuf/internal/descriptor_test.py

python/google/protobuf/internal/encoder_test.py

python/google/protobuf/internal/generator_test.py

python/google/protobuf/internal/input_stream_test.py

python/google/protobuf/internal/output_stream_test.py

python/google/protobuf/internal/reflection_test.py

python/google/protobuf/internal/service_reflection_test.py

python/google/protobuf/internal/text_format_test.py

python/google/protobuf/internal/wire_format_test.py

python/google/protobuf/message.py

python/google/protobuf/reflection.py

python/setup.py

src/Makefile.am

src/Makefile.in

src/google/protobuf/compiler/command_line_interface.cc

src/google/protobuf/compiler/cpp/cpp_enum_field.cc

src/google/protobuf/compiler/cpp/cpp_enum_field.h

src/google/protobuf/compiler/cpp/cpp_field.h

src/google/protobuf/compiler/cpp/cpp_message.cc

src/google/protobuf/compiler/cpp/cpp_message.h

src/google/protobuf/compiler/cpp/cpp_message_field.cc

src/google/protobuf/compiler/cpp/cpp_message_field.h

src/google/protobuf/compiler/cpp/cpp_primitive_field.cc

src/google/protobuf/compiler/cpp/cpp_primitive_field.h

src/google/protobuf/compiler/cpp/cpp_service.cc

src/google/protobuf/compiler/cpp/cpp_string_field.cc

src/google/protobuf/compiler/cpp/cpp_string_field.h

src/google/protobuf/compiler/cpp/cpp_unittest.cc

src/google/protobuf/compiler/importer.cc

src/google/protobuf/compiler/importer_unittest.cc

src/google/protobuf/compiler/parser.cc

src/google/protobuf/compiler/parser.h

src/google/protobuf/compiler/parser_unittest.cc

src/google/protobuf/descriptor.cc

src/google/protobuf/descriptor.pb.cc

src/google/protobuf/descriptor.pb.h

src/google/protobuf/descriptor.proto

src/google/protobuf/descriptor_unittest.cc

src/google/protobuf/dynamic_message.cc

src/google/protobuf/dynamic_message_unittest.cc

src/google/protobuf/extension_set.cc

src/google/protobuf/extension_set.h

src/google/protobuf/extension_set_unittest.cc

src/google/protobuf/generated_message_reflection.cc

src/google/protobuf/generated_message_reflection.h

src/google/protobuf/io/tokenizer.cc

src/google/protobuf/io/tokenizer.h

src/google/protobuf/io/tokenizer_unittest.cc

src/google/protobuf/io/zero_copy_stream_impl.cc

src/google/protobuf/io/zero_copy_stream_unittest.cc

src/google/protobuf/message.cc

src/google/protobuf/message.h

src/google/protobuf/message_unittest.cc

src/google/protobuf/repeated_field.cc

src/google/protobuf/repeated_field.h

src/google/protobuf/repeated_field_unittest.cc

src/google/protobuf/stubs/common.h

src/google/protobuf/stubs/strutil.cc

src/google/protobuf/stubs/strutil.h

src/google/protobuf/stubs/strutil_unittest.cc

src/google/protobuf/text_format.cc

src/google/protobuf/text_format_unittest.cc

src/google/protobuf/unittest.proto

src/google/protobuf/unittest_custom_options.proto

src/google/protobuf/unittest_optimize_for.proto

src/google/protobuf/unknown_field_set.cc

src/google/protobuf/unknown_field_set.h

src/google/protobuf/unknown_field_set_unittest.cc

src/google/protobuf/wire_format.cc

src/google/protobuf/wire_format_inl.h

src/google/protobuf/wire_format_unittest.cc

src/gtest/gtest.cc

src/gtest/internal/gtest-internal.h

src/gtest/internal/gtest-port.h

vsprojects/libprotobuf.vcproj

vsprojects/readme.txt

vsprojects/tests.vcproj

Show diffs side-by-side

added added

removed removed

src/google/protobuf/compiler/importer_unittest.cc

516

516

source_tree_.DiskFileToVirtualFile(

517

517

"../../baz", &virtual_file, &shadowing_disk_file));

518

518

519

// "/foo" is not mapped (it should not be misintepreted as being under ".").

520

EXPECT_EQ(DiskSourceTree::NO_MAPPING,

521

source_tree_.DiskFileToVirtualFile(

522

"/foo", &virtual_file, &shadowing_disk_file));

523

524

#ifdef WIN32

525

// "C:\foo" is not mapped (it should not be misintepreted as being under ".").

526

EXPECT_EQ(DiskSourceTree::NO_MAPPING,

527

source_tree_.DiskFileToVirtualFile(

528

"C:\\foo", &virtual_file, &shadowing_disk_file));

529

#endif // WIN32

530

519

531

// But "../baz" should be.

520

532

EXPECT_EQ(DiskSourceTree::CANNOT_OPEN,

521

533

source_tree_.DiskFileToVirtualFile(

Older »