diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2016-03-28 19:29:18 +0300 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2016-03-28 19:29:18 +0300 |
| commit | f5fff1eda05ef0a1370f9a83068526b3e8aebfc7 (patch) | |
| tree | eacb0c0f6dd8410b40b6bf26e779b38ef2c20774 /src | |
| parent | 3d791c46f5eddaa620be1f8a90b53b7c7aaa4cf3 (diff) | |
| download | nginx-f5fff1eda05ef0a1370f9a83068526b3e8aebfc7.tar.gz nginx-f5fff1eda05ef0a1370f9a83068526b3e8aebfc7.zip | |
Fixed --test-build-*.
Fixes various aspects of --test-build-devpoll, --test-build-eventport, and
--test-build-epoll.
In particular, if --test-build-devpoll was used on Linux, then "devpoll"
event method would be preferred over "epoll". Also, wrong definitions of
event macros were chosen.
Diffstat (limited to 'src')
| -rw-r--r-- | src/event/ngx_event.c | 2 | ||||
| -rw-r--r-- | src/event/ngx_event.h | 5 | ||||
| -rw-r--r-- | src/os/unix/ngx_posix_config.h | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c index 77800b787..38f9b3899 100644 --- a/src/event/ngx_event.c +++ b/src/event/ngx_event.c @@ -1208,7 +1208,7 @@ ngx_event_core_init_conf(ngx_cycle_t *cycle, void *conf) #endif -#if (NGX_HAVE_DEVPOLL) +#if (NGX_HAVE_DEVPOLL) && !(NGX_TEST_BUILD_DEVPOLL) module = &ngx_devpoll_module; diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h index 03854d88f..591005a20 100644 --- a/src/event/ngx_event.h +++ b/src/event/ngx_event.h @@ -343,7 +343,8 @@ extern ngx_event_actions_t ngx_event_actions; #define NGX_DISABLE_EVENT EV_DISABLE -#elif (NGX_HAVE_DEVPOLL || NGX_HAVE_EVENTPORT) +#elif (NGX_HAVE_DEVPOLL && !(NGX_TEST_BUILD_DEVPOLL)) \ + || (NGX_HAVE_EVENTPORT && !(NGX_TEST_BUILD_EVENTPORT)) #define NGX_READ_EVENT POLLIN #define NGX_WRITE_EVENT POLLOUT @@ -352,7 +353,7 @@ extern ngx_event_actions_t ngx_event_actions; #define NGX_ONESHOT_EVENT 1 -#elif (NGX_HAVE_EPOLL) +#elif (NGX_HAVE_EPOLL) && !(NGX_TEST_BUILD_EPOLL) #define NGX_READ_EVENT (EPOLLIN|EPOLLRDHUP) #define NGX_WRITE_EVENT EPOLLOUT diff --git a/src/os/unix/ngx_posix_config.h b/src/os/unix/ngx_posix_config.h index bf75997f6..5d1358e24 100644 --- a/src/os/unix/ngx_posix_config.h +++ b/src/os/unix/ngx_posix_config.h @@ -128,7 +128,7 @@ #endif -#if (NGX_HAVE_DEVPOLL) +#if (NGX_HAVE_DEVPOLL) && !(NGX_TEST_BUILD_DEVPOLL) #include <sys/ioctl.h> #include <sys/devpoll.h> #endif |