~brianaker/libmemcached/1164440

« back to all changes in this revision

Viewing changes to libtest/collection.cc

  • Committer: Continuous Integration
  • Date: 2012-10-22 05:56:09 UTC
  • mfrom: (1086.1.8 libmemcached-1.0)
  • Revision ID: ci@tangent.org-20121022055609-cbooaw9bcdal4qge
Merge lp:~tangent-org/libmemcached/1.0-build Build: jenkins-Libmemcached-1.0-87

Show diffs side-by-side

added added

removed removed

Lines of Context:
118
118
          }
119
119
        }
120
120
 
121
 
        alarm(600);
 
121
        set_alarm();
 
122
 
122
123
        try 
123
124
        {
124
125
          return_code= runner_code(_frame, run, _timer);
125
126
        }
126
127
        catch (...)
127
128
        {
128
 
          alarm(0);
 
129
          cancel_alarm();
 
130
 
129
131
          throw;
130
132
        }
131
 
        alarm(0);
 
133
        libtest::cancel_alarm();
132
134
      }
133
 
      catch (libtest::exception &e)
 
135
      catch (libtest::fatal &e)
134
136
      {
135
137
        stream::cerr(e.file(), e.line(), e.func()) << e.what();
136
138
        _failed++;