← Back to branch summary

~statik/ubuntu/maverick/protobuf/A

« back to all changes in this revision

Viewing changes to gtest/test/gtest_filter_unittest_.cc

  • Committer: Bazaar Package Importer
  • Author(s): Steve Kowalik
  • Date: 2010-02-11 11:13:19 UTC
  • mfrom: (2.2.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20100211111319-zdn8hmw0gh8s4cf8
Tags: 2.2.0a-0.1ubuntu1
* Merge from Debian testing.
* Remaining Ubuntu changes:
  - Don't use python2.4.
* Ubuntu changes dropped:
  - Disable death tests on Itanium, fixed upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gtest/test/gtest_filter_unittest_.cc
140
140
}  // namespace
141
141
 
142
142
int main(int argc, char **argv) {
143
 
  testing::InitGoogleTest(&argc, argv);
 
143
  ::testing::InitGoogleTest(&argc, argv);
144
144
 
145
145
  return RUN_ALL_TESTS();
146
146
}