← Back to branch summary

~brianaker/gearmand/osx9-fixes

« back to all changes in this revision

Viewing changes to tests/hostile.cc

  • Committer: Brian Aker
  • Date: 2013-10-11 09:13:33 UTC
  • Revision ID: brian@tangent.org-20131011091333-bkejkgk5uos6yjre
Update hostile target

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/hostile.cc
81
81
}
82
82
#pragma GCC diagnostic pop
83
83
 
84
 
static in_port_t hostile_server= 0;
85
 
static in_port_t& current_server_= hostile_server;
 
84
static in_port_t hostile_server_port= 0;
 
85
static in_port_t& current_server_= hostile_server_port;
86
86
 
87
87
static void reset_server()
88
88
{
89
 
  current_server_= hostile_server;
 
89
  current_server_= hostile_server_port;
90
90
}
91
91
 
92
92
static in_port_t current_server()
358
358
  test_skip(true, libtest::is_massive());
359
359
 
360
360
  // Programmer error
361
 
  assert(hostile_server);
 
361
  assert(hostile_server_port);
362
362
 
363
 
  set_server(hostile_server);
 
363
  set_server(hostile_server_port);
364
364
  worker_ramp_SETUP(object);
365
365
 
366
366
  return TEST_SUCCESS;
544
544
 
545
545
static void *world_create(server_startup_st& servers, test_return_t&)
546
546
{
547
 
  SKIP_IF(valgrind_is_caller() == true);
548
 
  SKIP_IF(has_hostile() == false);
 
547
  SKIP_IF(valgrind_is_caller());
 
548
  SKIP_UNLESS(has_hostile());
549
549
 
550
 
  hostile_server= libtest::get_free_port();
551
 
  ASSERT_TRUE(server_startup(servers, SERVER_TARGET, hostile_server, NULL));
 
550
  hostile_server_port= libtest::get_free_port();
 
551
  ASSERT_TRUE(server_startup(servers, SERVER_TARGET, hostile_server_port, NULL));
552
552
 
553
553
  return new worker_handles_st;
554
554
}