The cirros image was rebuilt against the 3.13.0-83 kernel, drivers e1000e, igbvf...
[packages/trusty/cirros-testvm.git] / cirros-testvm / src-cirros / buildroot-2015.05 / package / zeromq / 0001-tests-disable-test_fork-if-fork-is-not-available.patch
1 From b50912f2eecec1ea7accc155f8132116f8702075 Mon Sep 17 00:00:00 2001
2 From: Samuel Martin <s.martin49@gmail.com>
3 Date: Sat, 3 May 2014 12:22:38 +0200
4 Subject: [PATCH] tests: disable test_fork if fork() is not available
5
6 Signed-off-by: Samuel Martin <s.martin49@gmail.com>
7 ---
8  configure.ac      | 1 +
9  tests/Makefile.am | 8 ++++++--
10  tests/Makefile.in | 8 ++++----
11  3 files changed, 11 insertions(+), 6 deletions(-)
12
13 diff --git a/configure.ac b/configure.ac
14 index 0c41604..8f8521c 100644
15 --- a/configure.ac
16 +++ b/configure.ac
17 @@ -431,6 +431,7 @@ AM_CONDITIONAL(BUILD_PGM, test "x$libzmq_pgm_ext" = "xyes")
18  AM_CONDITIONAL(ON_MINGW, test "x$libzmq_on_mingw32" = "xyes")
19  AM_CONDITIONAL(ON_ANDROID, test "x$libzmq_on_android" = "xyes")
20  AM_CONDITIONAL(ON_LINUX, test "x$libzmq_on_linux" = "xyes")
21 +AM_CONDITIONAL(HAVE_FORK, test "x$ac_cv_func_fork" = "xyes")
22  
23  # Checks for library functions.
24  AC_TYPE_SIGNAL
25 diff --git a/tests/Makefile.am b/tests/Makefile.am
26 index 0cfe4e8..2a1e257 100644
27 --- a/tests/Makefile.am
28 +++ b/tests/Makefile.am
29 @@ -46,8 +46,10 @@ if !ON_MINGW
30  noinst_PROGRAMS += test_shutdown_stress \
31                     test_pair_ipc \
32                     test_reqrep_ipc \
33 -                   test_timeo \
34 -                   test_fork
35 +                   test_timeo
36 +if HAVE_FORK
37 +noinst_PROGRAMS += test_fork
38 +endif
39  endif
40  
41  test_system_SOURCES = test_system.cpp
42 @@ -93,8 +95,10 @@ test_shutdown_stress_SOURCES = test_shutdown_stress.cpp
43  test_pair_ipc_SOURCES = test_pair_ipc.cpp testutil.hpp
44  test_reqrep_ipc_SOURCES = test_reqrep_ipc.cpp testutil.hpp
45  test_timeo_SOURCES = test_timeo.cpp
46 +if HAVE_FORK
47  test_fork_SOURCES = test_fork.cpp
48  endif
49 +endif
50  
51  #  Run the test cases
52  TESTS = $(noinst_PROGRAMS)