Commit 310d7908 authored by Maria Matejka's avatar Maria Matejka
Browse files

Fixed on-push tests regarding the worker subsystem

parent 497a7e53
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ docker_ubuntu-16_04-amd64:
  - which gmake 2>/dev/null >/dev/null && MAKE=gmake
  - $MAKE
  # Run tests if they are available
  #  - $MAKE check
  - $MAKE check

build-debian-7-amd64:
  <<: *debian-7-amd64_env
+0 −2
Original line number Diff line number Diff line
@@ -86,8 +86,6 @@ main(int argc, char *argv[])
  bt_init(argc, argv);
  bt_bird_init();
  
  worker_queue_init();
  
  bt_assert_hook = bt_assert_filter;

  struct config *c = NULL;
+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ sysdep_preconfig(struct config *c)
  c->watchdog_warning = UNIX_DEFAULT_WATCHDOG_WARNING;

  c->workers = 4;
  c->max_workers = 8;

#ifdef PATH_IPROUTE_DIR
  read_iproute_table(PATH_IPROUTE_DIR "/rt_protos", "ipp_", 256);
+5 −1
Original line number Diff line number Diff line
@@ -2,7 +2,11 @@
#define _GNU_SOURCE
#endif

#ifdef DEBUGGING
#define TEST_MAX (1 << 16)
#else
#define TEST_MAX (1 << 12)
#endif

#include "test/birdtest.h"
#include "test/bt-utils.h"
@@ -155,7 +159,7 @@ int main(int argc, char *argv[])
  TEST_ALL_ONES(1, 5);
  TEST_ALL_ONES(2, 2);
  TEST_ALL_ONES(2, 8);
  TEST_ALL_ONES(8, 16);
  TEST_ALL_ONES(4, 32);

  return bt_exit_value();
}
+11 −2
Original line number Diff line number Diff line
@@ -522,8 +522,17 @@ void cmd_reconfig_undo_notify(void) {}
#include "nest/bird.h"
#include "lib/net.h"
#include "conf/conf.h"
void sysdep_preconfig(struct config *c UNUSED) {}
int sysdep_commit(struct config *new UNUSED, struct config *old UNUSED) { return 0; }
#include "lib/worker.h"
void sysdep_preconfig(struct config *c) {
  c->workers = 4;
  c->max_workers = 8;
}

int sysdep_commit(struct config *new, struct config *old UNUSED) {
  worker_queue_update(new);
  return 0;
}

void sysdep_shutdown_done(void) {}

#include "nest/cli.h"
Loading