← Back to branch summary

~statik/ubuntu/maverick/protobuf/A

« back to all changes in this revision

Viewing changes to gtest/src/gtest-death-test.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/src/gtest-death-test.cc
452
452
  if (!spawned())
453
453
    return false;
454
454
 
455
 
#if GTEST_HAS_GLOBAL_STRING
456
 
  const ::string error_message = GetCapturedStderr();
457
 
#else
458
 
  const ::std::string error_message = GetCapturedStderr();
459
 
#endif  // GTEST_HAS_GLOBAL_STRING
 
455
  const String error_message = GetCapturedStderr();
460
456
 
461
457
  bool success = false;
462
458
  Message buffer;
473
469
      break;
474
470
    case DIED:
475
471
      if (status_ok) {
476
 
        if (RE::PartialMatch(error_message, *regex())) {
 
472
        if (RE::PartialMatch(error_message.c_str(), *regex())) {
477
473
          success = true;
478
474
        } else {
479
475
          buffer << "    Result: died but not with expected error.\n"