TI-RPC: enhancements (pkg-config, libntirpc, travis)
cover TI-RPC: enhancements (pkg-config, libntirpc, travis)
Hi,
This started as pkg-config detection for libtirpc (IMHO better than #628 [1]). I also added option to use libntirpc in LTP and changed some tests in travis to use it (not all distros package it).
BTW Steve was asking in [2] whether these tests should be merged into libtirpc. I was thinking about it as well [3], but I think it's better to be in LTP. These tests are IMHO for libtirpc, libntirpc and glibc (although glibc deprecated them and since 2.26 they're installed only when configured with --enable-obsolete-rpc). But even glibc implementation fade out (i.e. all supported enterprise distros will ship without it), there will be still 2 projects using it. But if you lib{n,}tirpc developers agree on single git repository which would take these tests, it could be moved out of LTP (taking needed subset of LTP API).
Other TODO (regardless whether it stays in LTP)
* cleanup
* support for alternative header and shared library path (for testing lib{n,}tirpc git tree).
Kind regards,
Petr
[1] https://github.com/linux-test-project/ltp/pull/628
[2] https://sourceforge.net/p/libtirpc/mailman/message/36876891/
[3] https://lists.linux.it/pipermail/ltp/2019-December/014757.html
Petr Vorel (4):
rpc-tirpc: Detect libtirpc with pkg-config
rpc-tirpc: Add libntirpc support
travis: Merge debian.cross-compile.*.sh
travis: Test also libntirpc
.travis.yml | 24 ++++++++--------- include/lapi/rpc.h | 27 ------------------- include/mk/config.mk.in | 4 +-- m4/ltp-tirpc.m4 | 21 ++++++++------- testcases/network/Makefile | 2 +- .../rpc/rpc-tirpc/tests_pack/Makefile.inc | 4 +-- .../rpc/rpc-tirpc/tests_pack/include/rpc.h | 17 ++++++++++++ .../rpc_clnt_call_complex.c | 2 +- .../tirpc_rpcb_getaddr.c | 2 +- .../tirpc_rpcb_getaddr_limits.c | 2 +- .../tirpc_rpcb_getmaps.c | 2 +- .../tirpc_authdes_create.c | 2 +- .../tirpc_authdes_seccreate.c | 2 +- .../tirpc_authnone_create.c | 2 +- .../tirpc_authsys_create.c | 2 +- .../tirpc_authsys_create_default.c | 2 +- .../tirpc_bottomlevel_clnt_call.c | 2 +- .../tirpc_bottomlevel_clnt_call_complex.c | 2 +- .../tirpc_bottomlevel_clnt_call_dataint.c | 2 +- .../tirpc_bottomlevel_clnt_call_mt.c | 2 +- .../tirpc_bottomlevel_clnt_call_performance.c | 2 +- .../tirpc_bottomlevel_clnt_call_scalability.c | 2 +- .../tirpc_bottomlevel_clnt_call_stress.c | 2 +- .../tirpc_clnt_dg_create.c | 2 +- .../tirpc_clnt_dg_create_limits.c | 2 +- .../tirpc_clnt_vc_create.c | 2 +- .../tirpc_clnt_vc_create_limits.c | 2 +- .../tirpc_svc_dg_create.c | 2 +- .../tirpc_svc_dg_create_limits.c | 2 +- .../tirpc_svc_vc_create.c | 2 +- .../tirpc_svc_vc_create_limits.c | 2 +- .../tirpc_clnt_pcreateerror.c | 2 +- .../tirpc_err_clnt_perrno/tirpc_clnt_perrno.c | 2 +- .../tirpc_clnt_perrno_complex.c | 2 +- .../tirpc_err_clnt_perror/tirpc_clnt_perror.c | 2 +- .../tirpc_clnt_perror_complex.c | 2 +- .../tirpc_svcerr_noproc.c | 2 +- .../tirpc_svcerr_noprog.c | 2 +- .../tirpc_svcerr_progvers.c | 2 +- .../tirpc_svcerr_systemerr.c | 2 +- .../tirpc_svcerr_weakauth.c | 2 +- .../tirpc_expertlevel_clnt_call.c | 2 +- .../tirpc_expertlevel_clnt_call_complex.c | 2 +- .../tirpc_expertlevel_clnt_call_dataint.c | 2 +- .../tirpc_expertlevel_clnt_call_mt.c | 2 +- .../tirpc_expertlevel_clnt_call_performance.c | 2 +- .../tirpc_expertlevel_clnt_call_scalability.c | 2 +- .../tirpc_expertlevel_clnt_call_stress.c | 2 +- .../tirpc_clnt_tli_create.c | 2 +- .../tirpc_clnt_tli_create_limits.c | 2 +- .../tirpc_rpcb_rmtcall.c | 2 +- .../tirpc_rpcb_rmtcall_complex.c | 2 +- .../tirpc_rpcb_rmtcall_dataint.c | 2 +- .../tirpc_rpcb_rmtcall_mt.c | 2 +- .../tirpc_rpcb_rmtcall_performance.c | 2 +- .../tirpc_rpcb_rmtcall_scalability.c | 2 +- .../tirpc_rpcb_rmtcall_stress.c | 2 +- .../tirpc_rpcb_set.c | 2 +- .../tirpc_rpcb_unset.c | 2 +- .../tirpc_expertlevel_svc_reg/tirpc_svc_reg.c | 2 +- .../tirpc_svc_reg_mt.c | 2 +- .../tirpc_svc_reg_stress.c | 2 +- .../tirpc_svc_tli_create.c | 2 +- .../tirpc_svc_tli_create_limits.c | 2 +- .../tirpc_svc_unreg.c | 2 +- .../tirpc_svc_unreg_mt.c | 2 +- .../tirpc_svc_unreg_stress.c | 2 +- .../tirpc_interlevel_clnt_call.c | 2 +- .../tirpc_interlevel_clnt_call_complex.c | 2 +- .../tirpc_interlevel_clnt_call_dataint.c | 2 +- .../tirpc_interlevel_clnt_call_mt.c | 2 +- .../tirpc_interlevel_clnt_call_performance.c | 2 +- .../tirpc_interlevel_clnt_call_scalability.c | 2 +- .../tirpc_interlevel_clnt_call_stress.c | 2 +- .../tirpc_clnt_control.c | 2 +- .../tirpc_clnt_control_limits.c | 2 +- .../tirpc_clnt_tp_create.c | 2 +- .../tirpc_clnt_tp_create_timed.c | 2 +- .../tirpc_clnt_tp_create_timed_limits.c | 2 +- .../tirpc_svc_tp_create.c | 2 +- .../tirpc_rpc_broadcast.c | 2 +- .../tirpc_rpc_broadcast_complex.c | 2 +- .../tirpc_rpc_broadcast_dataint.c | 2 +- .../tirpc_rpc_broadcast_mt.c | 2 +- .../tirpc_rpc_broadcast_performance.c | 2 +- .../tirpc_rpc_broadcast_scalability.c | 2 +- .../tirpc_rpc_broadcast_stress.c | 2 +- .../tirpc_rpc_broadcast_exp.c | 2 +- .../tirpc_rpc_broadcast_exp_complex.c | 2 +- .../tirpc_rpc_broadcast_exp_dataint.c | 2 +- .../tirpc_rpc_broadcast_exp_limits.c | 2 +- .../tirpc_rpc_broadcast_exp_mt.c | 2 +- .../tirpc_rpc_broadcast_exp_performance.c | 2 +- .../tirpc_rpc_broadcast_exp_scalability.c | 2 +- .../tirpc_rpc_broadcast_exp_stress.c | 2 +- .../tirpc_simple_rpc_call/tirpc_rpc_call.c | 2 +- .../tirpc_rpc_call_complex.c | 2 +- .../tirpc_rpc_call_dataint.c | 2 +- .../tirpc_simple_rpc_call/tirpc_rpc_call_mt.c | 2 +- .../tirpc_rpc_call_performance.c | 2 +- .../tirpc_rpc_call_scalability.c | 2 +- .../tirpc_rpc_call_stress.c | 2 +- .../tirpc_simple_rpc_reg/tirpc_rpc_reg.c | 2 +- .../tirpc_simple_rpc_reg/tirpc_rpc_reg_mt.c | 2 +- .../tirpc_rpc_reg_stress.c | 2 +- .../tirpc_toplevel_clnt_call.c | 2 +- .../tirpc_toplevel_clnt_call_complex.c | 2 +- .../tirpc_toplevel_clnt_call_dataint.c | 2 +- .../tirpc_toplevel_clnt_call_mt.c | 2 +- .../tirpc_toplevel_clnt_call_performance.c | 2 +- .../tirpc_toplevel_clnt_call_scalability.c | 2 +- .../tirpc_toplevel_clnt_call_stress.c | 2 +- .../tirpc_clnt_create.c | 2 +- .../tirpc_clnt_create_timed.c | 2 +- .../tirpc_clnt_create_timed_limits.c | 2 +- .../tirpc_clnt_destroy.c | 2 +- .../tirpc_svc_create.c | 2 +- .../tirpc_svc_destroy.c | 2 +- .../rpc/rpc-tirpc/tests_pack/tirpc_cleaner.c | 2 +- .../tests_pack/tirpc_svc_1/tirpc_svc_1.c | 2 +- .../tests_pack/tirpc_svc_11/tirpc_svc_11.c | 2 +- .../tests_pack/tirpc_svc_2/tirpc_svc_2.c | 2 +- .../tests_pack/tirpc_svc_3/tirpc_svc_3.c | 2 +- .../tests_pack/tirpc_svc_4/tirpc_svc_4.c | 2 +- .../tests_pack/tirpc_svc_5/tirpc_svc_5.c | 2 +- .../tests_pack/tirpc_svc_6/tirpc_svc_6.c | 2 +- .../tests_pack/tirpc_svc_7/tirpc_svc_7.c | 2 +- .../tests_pack/tirpc_svc_8/tirpc_svc_8.c | 2 +- .../tests_pack/tirpc_svc_9/tirpc_svc_9.c | 2 +- travis/debian.cross-compile.aarch64.sh | 7 ----- travis/debian.cross-compile.ppc64le.sh | 7 ----- travis/debian.cross-compile.sh | 22 +++++++++++++++ travis/debian.i386.sh | 5 ++-- travis/debian.sh | 13 ++++++--- travis/fedora.sh | 12 +++++++-- travis/tumbleweed.sh | 5 ++-- 136 files changed, 216 insertions(+), 198 deletions(-) delete mode 100644 include/lapi/rpc.h create mode 100644 testcases/network/rpc/rpc-tirpc/tests_pack/include/rpc.h delete mode 100755 travis/debian.cross-compile.aarch64.sh delete mode 100755 travis/debian.cross-compile.ppc64le.sh create mode 100755 travis/debian.cross-compile.sh
Signature · 1 line
2.24.1
PATCH 1/4 rpc-tirpc: Detect libtirpc with pkg-config
Using pkg-config is more reliable way than detecting presence of libtirpc shared library with headers. As it does not require use $SYSROOT, which is not defined everywhere (at least SDKs built in YOCTO as they use nonstandard $SDKTARGETSYSROOT, see [1]).
+ use only <rpc/*.h> includes, <tirpc/rpc/*.h> removed as not needed (pkg-config detects -I/usr/include/tirpc when needed). Therefore rpc.h moved out of lapi.
+ use CFLAGS instead of CPPFLAGS in testcases/network/rpc/rpc-tirpc/tests_pack/Makefile.inc (C source).
[1] https://github.com/linux-test-project/ltp/pull/628
--- include/lapi/rpc.h | 27 ------------------- include/mk/config.mk.in | 4 +-- m4/ltp-tirpc.m4 | 18 ++++++------- testcases/network/Makefile | 2 +- .../rpc/rpc-tirpc/tests_pack/Makefile.inc | 4 +-- .../rpc/rpc-tirpc/tests_pack/include/rpc.h | 17 ++++++++++++ .../rpc_clnt_call_complex.c | 2 +- .../tirpc_rpcb_getaddr.c | 2 +- .../tirpc_rpcb_getaddr_limits.c | 2 +- .../tirpc_rpcb_getmaps.c | 2 +- .../tirpc_authdes_create.c | 2 +- .../tirpc_authdes_seccreate.c | 2 +- .../tirpc_authnone_create.c | 2 +- .../tirpc_authsys_create.c | 2 +- .../tirpc_authsys_create_default.c | 2 +- .../tirpc_bottomlevel_clnt_call.c | 2 +- .../tirpc_bottomlevel_clnt_call_complex.c | 2 +- .../tirpc_bottomlevel_clnt_call_dataint.c | 2 +- .../tirpc_bottomlevel_clnt_call_mt.c | 2 +- .../tirpc_bottomlevel_clnt_call_performance.c | 2 +- .../tirpc_bottomlevel_clnt_call_scalability.c | 2 +- .../tirpc_bottomlevel_clnt_call_stress.c | 2 +- .../tirpc_clnt_dg_create.c | 2 +- .../tirpc_clnt_dg_create_limits.c | 2 +- .../tirpc_clnt_vc_create.c | 2 +- .../tirpc_clnt_vc_create_limits.c | 2 +- .../tirpc_svc_dg_create.c | 2 +- .../tirpc_svc_dg_create_limits.c | 2 +- .../tirpc_svc_vc_create.c | 2 +- .../tirpc_svc_vc_create_limits.c | 2 +- .../tirpc_clnt_pcreateerror.c | 2 +- .../tirpc_err_clnt_perrno/tirpc_clnt_perrno.c | 2 +- .../tirpc_clnt_perrno_complex.c | 2 +- .../tirpc_err_clnt_perror/tirpc_clnt_perror.c | 2 +- .../tirpc_clnt_perror_complex.c | 2 +- .../tirpc_svcerr_noproc.c | 2 +- .../tirpc_svcerr_noprog.c | 2 +- .../tirpc_svcerr_progvers.c | 2 +- .../tirpc_svcerr_systemerr.c | 2 +- .../tirpc_svcerr_weakauth.c | 2 +- .../tirpc_expertlevel_clnt_call.c | 2 +- .../tirpc_expertlevel_clnt_call_complex.c | 2 +- .../tirpc_expertlevel_clnt_call_dataint.c | 2 +- .../tirpc_expertlevel_clnt_call_mt.c | 2 +- .../tirpc_expertlevel_clnt_call_performance.c | 2 +- .../tirpc_expertlevel_clnt_call_scalability.c | 2 +- .../tirpc_expertlevel_clnt_call_stress.c | 2 +- .../tirpc_clnt_tli_create.c | 2 +- .../tirpc_clnt_tli_create_limits.c | 2 +- .../tirpc_rpcb_rmtcall.c | 2 +- .../tirpc_rpcb_rmtcall_complex.c | 2 +- .../tirpc_rpcb_rmtcall_dataint.c | 2 +- .../tirpc_rpcb_rmtcall_mt.c | 2 +- .../tirpc_rpcb_rmtcall_performance.c | 2 +- .../tirpc_rpcb_rmtcall_scalability.c | 2 +- .../tirpc_rpcb_rmtcall_stress.c | 2 +- .../tirpc_rpcb_set.c | 2 +- .../tirpc_rpcb_unset.c | 2 +- .../tirpc_expertlevel_svc_reg/tirpc_svc_reg.c | 2 +- .../tirpc_svc_reg_mt.c | 2 +- .../tirpc_svc_reg_stress.c | 2 +- .../tirpc_svc_tli_create.c | 2 +- .../tirpc_svc_tli_create_limits.c | 2 +- .../tirpc_svc_unreg.c | 2 +- .../tirpc_svc_unreg_mt.c | 2 +- .../tirpc_svc_unreg_stress.c | 2 +- .../tirpc_interlevel_clnt_call.c | 2 +- .../tirpc_interlevel_clnt_call_complex.c | 2 +- .../tirpc_interlevel_clnt_call_dataint.c | 2 +- .../tirpc_interlevel_clnt_call_mt.c | 2 +- .../tirpc_interlevel_clnt_call_performance.c | 2 +- .../tirpc_interlevel_clnt_call_scalability.c | 2 +- .../tirpc_interlevel_clnt_call_stress.c | 2 +- .../tirpc_clnt_control.c | 2 +- .../tirpc_clnt_control_limits.c | 2 +- .../tirpc_clnt_tp_create.c | 2 +- .../tirpc_clnt_tp_create_timed.c | 2 +- .../tirpc_clnt_tp_create_timed_limits.c | 2 +- .../tirpc_svc_tp_create.c | 2 +- .../tirpc_rpc_broadcast.c | 2 +- .../tirpc_rpc_broadcast_complex.c | 2 +- .../tirpc_rpc_broadcast_dataint.c | 2 +- .../tirpc_rpc_broadcast_mt.c | 2 +- .../tirpc_rpc_broadcast_performance.c | 2 +- .../tirpc_rpc_broadcast_scalability.c | 2 +- .../tirpc_rpc_broadcast_stress.c | 2 +- .../tirpc_rpc_broadcast_exp.c | 2 +- .../tirpc_rpc_broadcast_exp_complex.c | 2 +- .../tirpc_rpc_broadcast_exp_dataint.c | 2 +- .../tirpc_rpc_broadcast_exp_limits.c | 2 +- .../tirpc_rpc_broadcast_exp_mt.c | 2 +- .../tirpc_rpc_broadcast_exp_performance.c | 2 +- .../tirpc_rpc_broadcast_exp_scalability.c | 2 +- .../tirpc_rpc_broadcast_exp_stress.c | 2 +- .../tirpc_simple_rpc_call/tirpc_rpc_call.c | 2 +- .../tirpc_rpc_call_complex.c | 2 +- .../tirpc_rpc_call_dataint.c | 2 +- .../tirpc_simple_rpc_call/tirpc_rpc_call_mt.c | 2 +- .../tirpc_rpc_call_performance.c | 2 +- .../tirpc_rpc_call_scalability.c | 2 +- .../tirpc_rpc_call_stress.c | 2 +- .../tirpc_simple_rpc_reg/tirpc_rpc_reg.c | 2 +- .../tirpc_simple_rpc_reg/tirpc_rpc_reg_mt.c | 2 +- .../tirpc_rpc_reg_stress.c | 2 +- .../tirpc_toplevel_clnt_call.c | 2 +- .../tirpc_toplevel_clnt_call_complex.c | 2 +- .../tirpc_toplevel_clnt_call_dataint.c | 2 +- .../tirpc_toplevel_clnt_call_mt.c | 2 +- .../tirpc_toplevel_clnt_call_performance.c | 2 +- .../tirpc_toplevel_clnt_call_scalability.c | 2 +- .../tirpc_toplevel_clnt_call_stress.c | 2 +- .../tirpc_clnt_create.c | 2 +- .../tirpc_clnt_create_timed.c | 2 +- .../tirpc_clnt_create_timed_limits.c | 2 +- .../tirpc_clnt_destroy.c | 2 +- .../tirpc_svc_create.c | 2 +- .../tirpc_svc_destroy.c | 2 +- .../rpc/rpc-tirpc/tests_pack/tirpc_cleaner.c | 2 +- .../tests_pack/tirpc_svc_1/tirpc_svc_1.c | 2 +- .../tests_pack/tirpc_svc_11/tirpc_svc_11.c | 2 +- .../tests_pack/tirpc_svc_2/tirpc_svc_2.c | 2 +- .../tests_pack/tirpc_svc_3/tirpc_svc_3.c | 2 +- .../tests_pack/tirpc_svc_4/tirpc_svc_4.c | 2 +- .../tests_pack/tirpc_svc_5/tirpc_svc_5.c | 2 +- .../tests_pack/tirpc_svc_6/tirpc_svc_6.c | 2 +- .../tests_pack/tirpc_svc_7/tirpc_svc_7.c | 2 +- .../tests_pack/tirpc_svc_8/tirpc_svc_8.c | 2 +- .../tests_pack/tirpc_svc_9/tirpc_svc_9.c | 2 +- travis/debian.cross-compile.aarch64.sh | 8 ++++-- travis/debian.cross-compile.ppc64le.sh | 8 ++++-- travis/debian.i386.sh | 5 ++-- travis/debian.sh | 5 ++-- travis/fedora.sh | 5 +++- travis/tumbleweed.sh | 5 ++-- 134 files changed, 178 insertions(+), 174 deletions(-) delete mode 100644 include/lapi/rpc.h create mode 100644 testcases/network/rpc/rpc-tirpc/tests_pack/include/rpc.h
include/lapi/rpc.h deleted +0 -27
@@ -1,27 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* -* Copyright (c) 2018 Petr Vorel <[email protected]> -*/ - -#ifndef LAPI_RPC_H__ -#define LAPI_RPC_H__ - -#include "config.h" - -#ifdef HAVE_NETCONFIG_H -# include <netconfig.h> -# include <rpc/rpc.h> -# include <rpc/types.h> -# include <rpc/xdr.h> -# include <rpc/svc.h> -#elif defined(HAVE_TIRPC_NETCONFIG_H ) -# include <tirpc/netconfig.h> -# include <tirpc/rpc/rpc.h> -# include <tirpc/rpc/types.h> -# include <tirpc/rpc/xdr.h> -# include <tirpc/rpc/svc.h> -#else -# error Missing rpc headers! -#endif - -#endif /* LAPI_RPC_H__ */
include/mk/config.mk.in +2 -2
@@ -43,8 +43,8 @@ CRYPTO_LIBS := @CRYPTO_LIBS@ LEXLIB := @LEXLIB@ NUMA_LIBS := @NUMA_LIBS@ SELINUX_LIBS := @SELINUX_LIBS@ -TIRPC_CPPFLAGS := @TIRPC_CPPFLAGS@ -TIRPC_LIBS := @TIRPC_LIBS@ +LIBTIRPC_CPPFLAGS := @LIBTIRPC_CPPFLAGS@ +LIBTIRPC_LIBS := @LIBTIRPC_LIBS@ KEYUTILS_LIBS := @KEYUTILS_LIBS@ HAVE_FTS_H := @HAVE_FTS_H@
m4/ltp-tirpc.m4 +9 -9
@@ -1,15 +1,15 @@ dnl SPDX-License-Identifier: GPL-2.0-or-later +dnl Copyright (c) 2020 Petr Vorel <[email protected]> dnl Copyright (c) 2014 Oracle and/or its affiliates. All Rights Reserved. -AC_DEFUN([LTP_CHECK_TIRPC],[ - TIRPC_CPPFLAGS="" - TIRPC_LIBS="" +AC_DEFUN([LTP_CHECK_TIRPC], [ + dnl libtirpc library and headers + PKG_CHECK_MODULES([LIBTIRPC], [libtirpc], [have_libtirpc=yes], [have_libtirpc=no]) - AC_CHECK_HEADERS([tirpc/netconfig.h netconfig.h], [ - TIRPC_CPPFLAGS="-I${SYSROOT}/usr/include/tirpc" - AC_DEFINE(HAVE_LIBTIRPC, 1, [Define to 1 if you have libtirpc headers installed]) - AC_CHECK_LIB(tirpc, rpcb_set, [TIRPC_LIBS="-ltirpc"])]) + dnl TI-RPC headers (in glibc, since 2.26 installed only when configured with --enable-obsolete-rpc) + AC_CHECK_HEADERS([rpc/rpc.h], [have_rpc_headers=yes]) - AC_SUBST(TIRPC_CPPFLAGS) - AC_SUBST(TIRPC_LIBS) + if test "x$have_libtirpc" = "xyes" -o "x$have_rpc_headers" = "xyes"; then + AC_DEFINE([HAVE_TIRPC], [1], [Define to 1 if you have libtirpc library and headers or glibc with TI-RPC support]) + fi ])
testcases/network/Makefile +1 -1
@@ -39,7 +39,7 @@ ifeq ($(ANDROID),1) FILTER_OUT_DIRS += lib6 rpc sockets endif -ifeq ($(TIRPC_LIBS),) +ifeq ($(HAVE_TIRPC),) FILTER_OUT_DIRS += rpc endif
testcases/network/rpc/rpc-tirpc/tests_pack/Makefile.inc +2 -2
@@ -30,5 +30,5 @@ $(LIBRPC-TIRPC): $(LIBDIR) MAKE_DEPS += $(LIBRPC-TIRPC) LDFLAGS += -L$(LIBDIR) -LDLIBS += $(TIRPC_LIBS) -lrpc-tirpc -CPPFLAGS += $(TIRPC_CPPFLAGS) -I$(LIBSRCDIR) -pthread +LDLIBS += $(LIBTIRPC_LIBS) -lrpc-tirpc +CFLAGS += $(LIBTIRPC_CFLAGS) -I$(LIBSRCDIR) -I$(LIBSRCDIR)/../include -pthread
testcases/network/rpc/rpc-tirpc/tests_pack/include/rpc.h new file +17 -0
@@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2018-2020 Petr Vorel <[email protected]> +*/ + +#ifndef LAPI_RPC_H__ +#define LAPI_RPC_H__ + +#include "config.h" + +#include <netconfig.h> +#include <rpc/rpc.h> +#include <rpc/types.h> +#include <rpc/xdr.h> +#include <rpc/svc.h> + +#endif /* LAPI_RPC_H__ */
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_stdcall_clnt_call/rpc_clnt_call_complex.c +1 -1
@@ -28,7 +28,7 @@#include <stdio.h> #include <stdlib.h> #include <time.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define CALCPROC 10000
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_addrmanagmt_rpcb_getaddr/tirpc_rpcb_getaddr.c +1 -1
@@ -29,7 +29,7 @@#include <stdio.h> #include <netinet/in.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_addrmanagmt_rpcb_getaddr/tirpc_rpcb_getaddr_limits.c +1 -1
@@ -28,7 +28,7 @@#include <stdio.h> #include <stdlib.h> #include <time.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_addrmanagmt_rpcb_getmaps/tirpc_rpcb_getmaps.c +1 -1
@@ -29,7 +29,7 @@#include <stdio.h> #include <netinet/in.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_auth_authdes_create/tirpc_authdes_create.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <time.h> #include <netdb.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_auth_authdes_seccreate/tirpc_authdes_seccreate.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <time.h> #include <netdb.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_auth_authnone_create/tirpc_authnone_create.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <time.h> #include <netdb.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_auth_authsys_create/tirpc_authsys_create.c +1 -1
@@ -30,7 +30,7 @@#include <time.h> #include <unistd.h> #include <netdb.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_auth_authsys_create_default/tirpc_authsys_create_default.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <time.h> #include <netdb.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_bottomlevel_clnt_call/tirpc_bottomlevel_clnt_call.c +1 -1
@@ -31,7 +31,7 @@#include <errno.h> #include <unistd.h> #include "librpc-tirpc.h" -#include "lapi/rpc.h" +#include "rpc.h" #define PROCNUM 1#define VERSNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_bottomlevel_clnt_call/tirpc_bottomlevel_clnt_call_complex.c +1 -1
@@ -30,7 +30,7 @@#include <time.h> #include <pthread.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define CALCTHREADPROC 1000
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_bottomlevel_clnt_call/tirpc_bottomlevel_clnt_call_dataint.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <string.h> #include <time.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define INTPROCNUM 10
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_bottomlevel_clnt_call/tirpc_bottomlevel_clnt_call_mt.c +1 -1
@@ -31,7 +31,7 @@#include <time.h> #include <pthread.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_bottomlevel_clnt_call/tirpc_bottomlevel_clnt_call_performance.c +1 -1
@@ -28,7 +28,7 @@#include <stdio.h> #include <stdlib.h> #include <sys/time.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_bottomlevel_clnt_call/tirpc_bottomlevel_clnt_call_scalability.c +1 -1
@@ -31,7 +31,7 @@#include <pthread.h> #include <time.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_bottomlevel_clnt_call/tirpc_bottomlevel_clnt_call_stress.c +1 -1
@@ -29,7 +29,7 @@#include <stdio.h> #include <netinet/in.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_bottomlevel_clnt_dg_create/tirpc_clnt_dg_create.c +1 -1
@@ -31,7 +31,7 @@#include <errno.h> #include <unistd.h> #include "librpc-tirpc.h" -#include "lapi/rpc.h" +#include "rpc.h" #define PROCNUM 1#define VERSNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_bottomlevel_clnt_dg_create/tirpc_clnt_dg_create_limits.c +1 -1
@@ -28,7 +28,7 @@#include <stdio.h> #include <stdlib.h> #include <time.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_bottomlevel_clnt_vc_create/tirpc_clnt_vc_create.c +1 -1
@@ -31,7 +31,7 @@#include <errno.h> #include <unistd.h> #include "librpc-tirpc.h" -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_bottomlevel_clnt_vc_create/tirpc_clnt_vc_create_limits.c +1 -1
@@ -28,7 +28,7 @@#include <stdio.h> #include <stdlib.h> #include <time.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_bottomlevel_svc_dg_create/tirpc_svc_dg_create.c +1 -1
@@ -31,7 +31,7 @@#include <errno.h> #include <unistd.h> #include "librpc-tirpc.h" -#include "lapi/rpc.h" +#include "rpc.h" #define PROCNUM 1#define VERSNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_bottomlevel_svc_dg_create/tirpc_svc_dg_create_limits.c +1 -1
@@ -28,7 +28,7 @@#include <stdio.h> #include <stdlib.h> #include <time.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_bottomlevel_svc_vc_create/tirpc_svc_vc_create.c +1 -1
@@ -31,7 +31,7 @@#include <errno.h> #include <unistd.h> #include "librpc-tirpc.h" -#include "lapi/rpc.h" +#include "rpc.h" #define PROCNUM 1#define VERSNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_bottomlevel_svc_vc_create/tirpc_svc_vc_create_limits.c +1 -1
@@ -28,7 +28,7 @@#include <stdio.h> #include <stdlib.h> #include <time.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_err_clnt_pcreateerror/tirpc_clnt_pcreateerror.c +1 -1
@@ -29,7 +29,7 @@#include <stdio.h> #include <netinet/in.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_err_clnt_perrno/tirpc_clnt_perrno.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <time.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_err_clnt_perrno/tirpc_clnt_perrno_complex.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <time.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_err_clnt_perror/tirpc_clnt_perror.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <time.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_err_clnt_perror/tirpc_clnt_perror_complex.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <time.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_err_svcerr_noproc/tirpc_svcerr_noproc.c +1 -1
@@ -29,7 +29,7 @@#include <stdio.h> #include <netinet/in.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 667
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_err_svcerr_noprog/tirpc_svcerr_noprog.c +1 -1
@@ -29,7 +29,7 @@#include <stdio.h> #include <netinet/in.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_err_svcerr_progvers/tirpc_svcerr_progvers.c +1 -1
@@ -29,7 +29,7 @@#include <stdio.h> #include <netinet/in.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_err_svcerr_systemerr/tirpc_svcerr_systemerr.c +1 -1
@@ -29,7 +29,7 @@#include <stdio.h> #include <netinet/in.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 10
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_err_svcerr_weakauth/tirpc_svcerr_weakauth.c +1 -1
@@ -29,7 +29,7 @@#include <stdio.h> #include <netinet/in.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 100
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_expertlevel_clnt_call/tirpc_expertlevel_clnt_call.c +1 -1
@@ -29,7 +29,7 @@#include <stdio.h> #include <netinet/in.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_expertlevel_clnt_call/tirpc_expertlevel_clnt_call_complex.c +1 -1
@@ -31,7 +31,7 @@#include <time.h> #include <pthread.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define CALCTHREADPROC 1000
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_expertlevel_clnt_call/tirpc_expertlevel_clnt_call_dataint.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <string.h> #include <time.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define INTPROCNUM 10
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_expertlevel_clnt_call/tirpc_expertlevel_clnt_call_mt.c +1 -1
@@ -31,7 +31,7 @@#include <time.h> #include <pthread.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_expertlevel_clnt_call/tirpc_expertlevel_clnt_call_performance.c +1 -1
@@ -28,7 +28,7 @@#include <stdio.h> #include <stdlib.h> #include <sys/time.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_expertlevel_clnt_call/tirpc_expertlevel_clnt_call_scalability.c +1 -1
@@ -31,7 +31,7 @@#include <pthread.h> #include <time.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_expertlevel_clnt_call/tirpc_expertlevel_clnt_call_stress.c +1 -1
@@ -29,7 +29,7 @@#include <stdio.h> #include <netinet/in.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_expertlevel_clnt_tli_create/tirpc_clnt_tli_create.c +1 -1
@@ -29,7 +29,7 @@#include <stdio.h> #include <netinet/in.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_expertlevel_clnt_tli_create/tirpc_clnt_tli_create_limits.c +1 -1
@@ -28,7 +28,7 @@#include <stdio.h> #include <stdlib.h> #include <time.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_expertlevel_rpcb_rmtcall/tirpc_rpcb_rmtcall.c +1 -1
@@ -29,7 +29,7 @@#include <stdio.h> #include <netinet/in.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_expertlevel_rpcb_rmtcall/tirpc_rpcb_rmtcall_complex.c +1 -1
@@ -31,7 +31,7 @@#include <time.h> #include <pthread.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define CALCTHREADPROC 1000
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_expertlevel_rpcb_rmtcall/tirpc_rpcb_rmtcall_dataint.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <string.h> #include <time.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define INTPROCNUM 10
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_expertlevel_rpcb_rmtcall/tirpc_rpcb_rmtcall_mt.c +1 -1
@@ -31,7 +31,7 @@#include <time.h> #include <pthread.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_expertlevel_rpcb_rmtcall/tirpc_rpcb_rmtcall_performance.c +1 -1
@@ -28,7 +28,7 @@#include <stdio.h> #include <stdlib.h> #include <sys/time.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_expertlevel_rpcb_rmtcall/tirpc_rpcb_rmtcall_scalability.c +1 -1
@@ -31,7 +31,7 @@#include <pthread.h> #include <time.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_expertlevel_rpcb_rmtcall/tirpc_rpcb_rmtcall_stress.c +1 -1
@@ -29,7 +29,7 @@#include <stdio.h> #include <netinet/in.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_expertlevel_rpcb_set/tirpc_rpcb_set.c +1 -1
@@ -29,7 +29,7 @@#include <stdio.h> #include <netinet/in.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" #define PROCNUM 1#define VERSNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_expertlevel_rpcb_unset/tirpc_rpcb_unset.c +1 -1
@@ -29,7 +29,7 @@#include <stdio.h> #include <netinet/in.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" #define PROCNUM 1#define VERSNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_expertlevel_svc_reg/tirpc_svc_reg.c +1 -1
@@ -29,7 +29,7 @@#include <stdio.h> #include <netinet/in.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_expertlevel_svc_reg/tirpc_svc_reg_mt.c +1 -1
@@ -31,7 +31,7 @@#include <time.h> #include <pthread.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_expertlevel_svc_reg/tirpc_svc_reg_stress.c +1 -1
@@ -29,7 +29,7 @@#include <stdio.h> #include <netinet/in.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_expertlevel_svc_tli_create/tirpc_svc_tli_create.c +1 -1
@@ -29,7 +29,7 @@#include <stdio.h> #include <netinet/in.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_expertlevel_svc_tli_create/tirpc_svc_tli_create_limits.c +1 -1
@@ -28,7 +28,7 @@#include <stdio.h> #include <stdlib.h> #include <time.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_expertlevel_svc_unreg/tirpc_svc_unreg.c +1 -1
@@ -29,7 +29,7 @@#include <stdio.h> #include <netinet/in.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_expertlevel_svc_unreg/tirpc_svc_unreg_mt.c +1 -1
@@ -31,7 +31,7 @@#include <time.h> #include <pthread.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_expertlevel_svc_unreg/tirpc_svc_unreg_stress.c +1 -1
@@ -29,7 +29,7 @@#include <stdio.h> #include <netinet/in.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_interlevel_clnt_call/tirpc_interlevel_clnt_call.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <time.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_interlevel_clnt_call/tirpc_interlevel_clnt_call_complex.c +1 -1
@@ -31,7 +31,7 @@#include <time.h> #include <pthread.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define CALCTHREADPROC 1000
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_interlevel_clnt_call/tirpc_interlevel_clnt_call_dataint.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <string.h> #include <time.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define INTPROCNUM 10
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_interlevel_clnt_call/tirpc_interlevel_clnt_call_mt.c +1 -1
@@ -31,7 +31,7 @@#include <time.h> #include <pthread.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_interlevel_clnt_call/tirpc_interlevel_clnt_call_performance.c +1 -1
@@ -28,7 +28,7 @@#include <stdio.h> #include <stdlib.h> #include <sys/time.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_interlevel_clnt_call/tirpc_interlevel_clnt_call_scalability.c +1 -1
@@ -31,7 +31,7 @@#include <pthread.h> #include <time.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_interlevel_clnt_call/tirpc_interlevel_clnt_call_stress.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <time.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_interlevel_clnt_control/tirpc_clnt_control.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <time.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_interlevel_clnt_control/tirpc_clnt_control_limits.c +1 -1
@@ -28,7 +28,7 @@#include <stdio.h> #include <stdlib.h> #include <time.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_interlevel_clnt_tp_create/tirpc_clnt_tp_create.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <time.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_interlevel_clnt_tp_create_timed/tirpc_clnt_tp_create_timed.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <time.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_interlevel_clnt_tp_create_timed/tirpc_clnt_tp_create_timed_limits.c +1 -1
@@ -28,7 +28,7 @@#include <stdio.h> #include <stdlib.h> #include <time.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_interlevel_svc_tp_create/tirpc_svc_tp_create.c +1 -1
@@ -28,7 +28,7 @@#include <stdio.h> #include <sys/socket.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define VERSNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_broadcast/tirpc_rpc_broadcast.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <time.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_broadcast/tirpc_rpc_broadcast_complex.c +1 -1
@@ -30,7 +30,7 @@#include <time.h> #include <sys/socket.h> #include <netdb.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PINGPROC 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_broadcast/tirpc_rpc_broadcast_dataint.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <string.h> #include <time.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define INTPROCNUM 10
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_broadcast/tirpc_rpc_broadcast_mt.c +1 -1
@@ -31,7 +31,7 @@#include <time.h> #include <pthread.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_broadcast/tirpc_rpc_broadcast_performance.c +1 -1
@@ -28,7 +28,7 @@#include <stdio.h> #include <stdlib.h> #include <sys/time.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_broadcast/tirpc_rpc_broadcast_scalability.c +1 -1
@@ -31,7 +31,7 @@#include <pthread.h> #include <time.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_broadcast/tirpc_rpc_broadcast_stress.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <time.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_broadcast_exp/tirpc_rpc_broadcast_exp.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <time.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_broadcast_exp/tirpc_rpc_broadcast_exp_complex.c +1 -1
@@ -30,7 +30,7 @@#include <time.h> #include <sys/socket.h> #include <netdb.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PINGPROC 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_broadcast_exp/tirpc_rpc_broadcast_exp_dataint.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <string.h> #include <time.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define INTPROCNUM 10
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_broadcast_exp/tirpc_rpc_broadcast_exp_limits.c +1 -1
@@ -28,7 +28,7 @@#include <stdio.h> #include <stdlib.h> #include <time.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_broadcast_exp/tirpc_rpc_broadcast_exp_mt.c +1 -1
@@ -31,7 +31,7 @@#include <time.h> #include <pthread.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_broadcast_exp/tirpc_rpc_broadcast_exp_performance.c +1 -1
@@ -28,7 +28,7 @@#include <stdio.h> #include <stdlib.h> #include <sys/time.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_broadcast_exp/tirpc_rpc_broadcast_exp_scalability.c +1 -1
@@ -31,7 +31,7 @@#include <pthread.h> #include <time.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_broadcast_exp/tirpc_rpc_broadcast_exp_stress.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <time.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_call/tirpc_rpc_call.c +1 -1
@@ -30,7 +30,7 @@#include <string.h> #include <time.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_call/tirpc_rpc_call_complex.c +1 -1
@@ -31,7 +31,7 @@#include <time.h> #include <pthread.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define CALCTHREADPROC 1000
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_call/tirpc_rpc_call_dataint.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <string.h> #include <time.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define INTPROCNUM 10
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_call/tirpc_rpc_call_mt.c +1 -1
@@ -31,7 +31,7 @@#include <time.h> #include <pthread.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_call/tirpc_rpc_call_performance.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <string.h> #include <sys/time.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_call/tirpc_rpc_call_scalability.c +1 -1
@@ -31,7 +31,7 @@#include <pthread.h> #include <time.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_call/tirpc_rpc_call_stress.c +1 -1
@@ -30,7 +30,7 @@#include <string.h> #include <time.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_reg/tirpc_rpc_reg.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <time.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_reg/tirpc_rpc_reg_mt.c +1 -1
@@ -31,7 +31,7 @@#include <time.h> #include <pthread.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_simple_rpc_reg/tirpc_rpc_reg_stress.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <time.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_toplevel_clnt_call/tirpc_toplevel_clnt_call.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <time.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_toplevel_clnt_call/tirpc_toplevel_clnt_call_complex.c +1 -1
@@ -31,7 +31,7 @@#include <time.h> #include <pthread.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define CALCTHREADPROC 1000
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_toplevel_clnt_call/tirpc_toplevel_clnt_call_dataint.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <string.h> #include <time.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define INTPROCNUM 10
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_toplevel_clnt_call/tirpc_toplevel_clnt_call_mt.c +1 -1
@@ -31,7 +31,7 @@#include <time.h> #include <pthread.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_toplevel_clnt_call/tirpc_toplevel_clnt_call_performance.c +1 -1
@@ -28,7 +28,7 @@#include <stdio.h> #include <stdlib.h> #include <sys/time.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_toplevel_clnt_call/tirpc_toplevel_clnt_call_scalability.c +1 -1
@@ -31,7 +31,7 @@#include <pthread.h> #include <time.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_toplevel_clnt_call/tirpc_toplevel_clnt_call_stress.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <time.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_toplevel_clnt_create/tirpc_clnt_create.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <time.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_toplevel_clnt_create_timed/tirpc_clnt_create_timed.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <time.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_toplevel_clnt_create_timed/tirpc_clnt_create_timed_limits.c +1 -1
@@ -28,7 +28,7 @@#include <stdio.h> #include <stdlib.h> #include <time.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_toplevel_clnt_destroy/tirpc_clnt_destroy.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <time.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_toplevel_svc_create/tirpc_svc_create.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <time.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/tirpc_toplevel_svc_destroy/tirpc_svc_destroy.c +1 -1
@@ -29,7 +29,7 @@#include <stdlib.h> #include <time.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define PROCNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_cleaner.c +1 -1
@@ -28,7 +28,7 @@#include <stdio.h> #include <sys/socket.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define VERSNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_1/tirpc_svc_1.c +1 -1
@@ -28,7 +28,7 @@#include <stdio.h> #include <sys/socket.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define VERSNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_11/tirpc_svc_11.c +1 -1
@@ -30,7 +30,7 @@#include <sys/socket.h> #include <errno.h> #include <netinet/in.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define VERSNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_2/tirpc_svc_2.c +1 -1
@@ -28,7 +28,7 @@#include <stdio.h> #include <sys/socket.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define VERSNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_3/tirpc_svc_3.c +1 -1
@@ -29,7 +29,7 @@#include <string.h> #include <sys/socket.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define VERSNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_4/tirpc_svc_4.c +1 -1
@@ -29,7 +29,7 @@#include <string.h> #include <sys/socket.h> #include <errno.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define VERSNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_5/tirpc_svc_5.c +1 -1
@@ -33,7 +33,7 @@#include <netinet/in.h> #include <unistd.h> #include "librpc-tirpc.h" -#include "lapi/rpc.h" +#include "rpc.h" #define VERSNUM 1#define PROCSIMPLEPING 1
testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_6/tirpc_svc_6.c +1 -1
@@ -31,7 +31,7 @@#include <errno.h> #include <pthread.h> #include <netinet/in.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define VERSNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_7/tirpc_svc_7.c +1 -1
@@ -30,7 +30,7 @@#include <sys/socket.h> #include <errno.h> #include <netinet/in.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define VERSNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_8/tirpc_svc_8.c +1 -1
@@ -31,7 +31,7 @@#include <sys/socket.h> #include <errno.h> #include <netinet/in.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define VERSNUM 1
testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_9/tirpc_svc_9.c +1 -1
@@ -31,7 +31,7 @@#include <sys/socket.h> #include <errno.h> #include <netinet/in.h> -#include "lapi/rpc.h" +#include "rpc.h" //Standard define #define VERSNUM 1
travis/debian.cross-compile.aarch64.sh +6 -2
@@ -1,7 +1,11 @@ #!/bin/sh -# Copyright (c) 2018 Petr Vorel <[email protected]> +# Copyright (c) 2018-2020 Petr Vorel <[email protected]> set -e +dpkg --add-architecture arm64 +apt update + apt install -y --no-install-recommends \ gcc-aarch64-linux-gnu \ - libc6-dev-arm64-cross + libc6-dev-arm64-cross \ + libtirpc-dev:arm64
travis/debian.cross-compile.ppc64le.sh +6 -2
@@ -1,7 +1,11 @@ #!/bin/sh -# Copyright (c) 2018 Petr Vorel <[email protected]> +# Copyright (c) 2018-2020 Petr Vorel <[email protected]> set -e +dpkg --add-architecture ppc64el +apt update + apt install -y --no-install-recommends \ gcc-powerpc64le-linux-gnu \ - libc6-dev-ppc64el-cross + libc6-dev-ppc64el-cross \ + libtirpc-dev:ppc64el
travis/debian.i386.sh +3 -2
@@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2018 Petr Vorel <[email protected]> +# Copyright (c) 2018-2020 Petr Vorel <[email protected]> set -e dpkg --add-architecture i386
@@ -16,4 +16,5 @@ apt install -y --no-install-recommends \ libkeyutils1:i386 \ libnuma1:i386 \ libssl-dev:i386 \ - libtirpc-dev:i386 + libtirpc-dev:i386 \ + pkg-config:i386
travis/debian.sh +3 -2
@@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2018-2019 Petr Vorel <[email protected]> +# Copyright (c) 2018-2020 Petr Vorel <[email protected]> set -e # workaround for missing oldstable-updates repository
@@ -35,4 +35,5 @@ apt install -y --no-install-recommends \ libssl-dev \ libtirpc-dev \ linux-libc-dev \ - lsb-release + lsb-release \ + pkg-config
travis/fedora.sh +4 -1
@@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2018 Petr Vorel <[email protected]> +# Copyright (c) 2018-2020 Petr Vorel <[email protected]> set -e yum -y install \
@@ -9,4 +9,7 @@ yum -y install \ clang \ gcc \ findutils \ + libtirpc \ + libtirpc-devel \ + pkg-config \ redhat-lsb-core
travis/tumbleweed.sh +3 -2
@@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2018 Petr Vorel <[email protected]> +# Copyright (c) 2018-2020 Petr Vorel <[email protected]> set -e zypper --non-interactive install --no-recommends \
@@ -19,4 +19,5 @@ zypper --non-interactive install --no-recommends \ libselinux-devel \ libtirpc-devel \ linux-glibc-devel \ - lsb-release + lsb-release \ + pkg-config
Signature · 1 line
2.24.1
PATCH 2/4 rpc-tirpc: Add libntirpc support
In reply to Petr Vorel--- m4/ltp-tirpc.m4 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
m4/ltp-tirpc.m4 +5 -2
@@ -6,10 +6,13 @@ AC_DEFUN([LTP_CHECK_TIRPC], [ dnl libtirpc library and headers PKG_CHECK_MODULES([LIBTIRPC], [libtirpc], [have_libtirpc=yes], [have_libtirpc=no]) + dnl libntirpc library and headers + PKG_CHECK_MODULES([LIBNTIRPC], [libntirpc], [have_libntirpc=yes], [have_libntirpc=no]) + dnl TI-RPC headers (in glibc, since 2.26 installed only when configured with --enable-obsolete-rpc) AC_CHECK_HEADERS([rpc/rpc.h], [have_rpc_headers=yes]) - if test "x$have_libtirpc" = "xyes" -o "x$have_rpc_headers" = "xyes"; then - AC_DEFINE([HAVE_TIRPC], [1], [Define to 1 if you have libtirpc library and headers or glibc with TI-RPC support]) + if test "x$have_libtirpc" = "xyes" -o "x$have_libntirpc" = "xyes" -o "x$have_rpc_headers" = "xyes"; then + AC_DEFINE([HAVE_TIRPC], [1], [Define to 1 if you have libtirpc or libntirpc library and headers or glibc with TI-RPC support]) fi ])
Signature · 1 line
2.24.1
PATCH 3/4 travis: Merge debian.cross-compile.*.sh
In reply to Petr Vorel--- .travis.yml | 6 +++--- travis/debian.cross-compile.aarch64.sh | 11 ----------- travis/debian.cross-compile.ppc64le.sh | 11 ----------- travis/debian.cross-compile.sh | 16 ++++++++++++++++ 4 files changed, 19 insertions(+), 25 deletions(-) delete mode 100755 travis/debian.cross-compile.aarch64.sh delete mode 100755 travis/debian.cross-compile.ppc64le.sh create mode 100755 travis/debian.cross-compile.sh
.travis.yml +3 -3
@@ -12,11 +12,11 @@ matrix: # cross compilation builds - os: linux - env: DISTRO=debian:stable VARIANT=cross-compile.ppc64le TREE="out" + env: DISTRO=debian:stable VARIANT=cross-compile ARCH=ppc64el TREE="out" compiler: powerpc64le-linux-gnu-gcc - os: linux - env: DISTRO=debian:stable VARIANT=cross-compile.aarch64 TREE="out" + env: DISTRO=debian:stable VARIANT=cross-compile ARCH=arm64 TREE="out" compiler: aarch64-linux-gnu-gcc # musl (native)
@@ -98,4 +98,4 @@ script: - INSTALL="${INSTALL%%/*}" - if [ ! "$TREE" ]; then TREE="in"; fi - case $VARIANT in cross-compile*) BUILD="cross";; i386) BUILD="32";; *) BUILD="native";; esac - - docker run -t ltp /bin/sh -c "cd travis && ./$INSTALL.sh && if [ \"$VARIANT\" ]; then ./$INSTALL.$VARIANT.sh; fi && ../build.sh -o $TREE -t $BUILD -c $CC" + - docker run -t ltp /bin/sh -c "cd travis && ./$INSTALL.sh && if [ \"$VARIANT\" ]; then ARCH=\"$ARCH\" ./$INSTALL.$VARIANT.sh; fi && ../build.sh -o $TREE -t $BUILD -c $CC"
travis/debian.cross-compile.aarch64.sh deleted +0 -11
@@ -1,11 +0,0 @@ -#!/bin/sh -# Copyright (c) 2018-2020 Petr Vorel <[email protected]> -set -e - -dpkg --add-architecture arm64 -apt update - -apt install -y --no-install-recommends \ - gcc-aarch64-linux-gnu \ - libc6-dev-arm64-cross \ - libtirpc-dev:arm64
travis/debian.cross-compile.ppc64le.sh deleted +0 -11
@@ -1,11 +0,0 @@ -#!/bin/sh -# Copyright (c) 2018-2020 Petr Vorel <[email protected]> -set -e - -dpkg --add-architecture ppc64el -apt update - -apt install -y --no-install-recommends \ - gcc-powerpc64le-linux-gnu \ - libc6-dev-ppc64el-cross \ - libtirpc-dev:ppc64el
travis/debian.cross-compile.sh new file +16 -0
@@ -0,0 +1,16 @@ +#!/bin/sh +# Copyright (c) 2018-2020 Petr Vorel <[email protected]> +set -e + +if [ -z "$ARCH" ]; + echo "missing \$ARCH!" + exit 1 +fi + +dpkg --add-architecture $ARCH +apt update + +apt install -y --no-install-recommends \ + gcc-${ARCH}-linux-gnu \ + libc6-dev-${ARCH}-cross \ + libtirpc-dev:${ARCH}
Signature · 1 line
2.24.1
PATCH 3/4 travis: Merge debian.cross-compile.*.sh
Hi,
this needs to be fixed, otherwise Debian cross compile jobs fail.
Kind regards,
Petr
debian.cross-compile.sh +8 -2
@@ -3,10 +3,16 @@ set -e if [ -z "$ARCH" ]; then - echo "missing \$ARCH!" + echo "missing \$ARCH!" >&2 exit 1 fi +case "$ARCH" in +arm64) gcc_arch="aarch64";; +ppc64el) gcc_arch="powerpc64le";; +*) echo "unsupported arch: '$1'!" >&2; exit 1;; +esac + dpkg --add-architecture $ARCH apt update
@@ -17,6 +23,6 @@ none) EXTRA_PACKAGES=;; esac apt install -y --no-install-recommends \ - gcc-${ARCH}-linux-gnu \ + gcc-${gcc_arch}-linux-gnu \ libc6-dev-${ARCH}-cross \ $EXTRA_PACKAGES
PATCH 4/4 travis: Test also libntirpc
In reply to Petr Vorelin some builds in distros which ship it (Debian and Fedora).
Also test builds in Debian stable and oldstable without lib{n,}tirpc (on stable results as no TI-RPC, oldstable will test glibc TI-RPC).
+ cleanup .travis.yml.
--- .travis.yml | 24 ++++++++++++------------ travis/debian.cross-compile.sh | 10 ++++++++-- travis/debian.sh | 10 ++++++++-- travis/fedora.sh | 11 ++++++++--- 4 files changed, 36 insertions(+), 19 deletions(-)
.travis.yml +12 -12
@@ -12,11 +12,11 @@ matrix: # cross compilation builds - os: linux - env: DISTRO=debian:stable VARIANT=cross-compile ARCH=ppc64el TREE="out" + env: DISTRO=debian:stable VARIANT=cross-compile ARCH=ppc64el TREE=out compiler: powerpc64le-linux-gnu-gcc - os: linux - env: DISTRO=debian:stable VARIANT=cross-compile ARCH=arm64 TREE="out" + env: DISTRO=debian:stable VARIANT=cross-compile ARCH=arm64 TREE=out RPC=libntirpc compiler: aarch64-linux-gnu-gcc # musl (native)
@@ -28,14 +28,14 @@ matrix: # build with minimal dependencies - os: linux - env: DISTRO=debian:stable VARIANT=minimal TREE="out" + env: DISTRO=debian:stable VARIANT=minimal TREE=out RPC=none compiler: clang # native non-intel - os: linux arch: ppc64le compiler: gcc - env: DISTRO=debian:testing + env: DISTRO=debian:testing RPC=libntirpc - os: linux arch: s390x
@@ -44,11 +44,11 @@ matrix: # other builds - os: linux - env: DISTRO=fedora:latest + env: DISTRO=fedora:latest RPC=libntirpc compiler: clang - os: linux - env: DISTRO=centos:6 TREE="out" + env: DISTRO=centos:6 TREE=out compiler: gcc - os: linux
@@ -56,7 +56,7 @@ matrix: compiler: gcc - os: linux - env: DISTRO=debian:oldstable + env: DISTRO=debian:oldstable RPC=none compiler: clang - os: linux
@@ -72,15 +72,15 @@ matrix: compiler: gcc - os: linux - env: DISTRO=debian:testing + env: DISTRO=debian:testing RPC=libntirpc compiler: clang - os: linux - env: DISTRO=ubuntu:latest TREE="out" + env: DISTRO=ubuntu:latest TREE=out compiler: gcc - os: linux - env: DISTRO=ubuntu:xenial + env: DISTRO=ubuntu:xenial RPC=libntirpc compiler: gcc - os: linux
@@ -90,7 +90,7 @@ matrix: before_install: - DIR="/usr/src/ltp" - printf "FROM $DISTRO\nRUN mkdir -p $DIR\nWORKDIR $DIR\nCOPY . $DIR\n" > Dockerfile - - echo "cat Dockerfile"; cat Dockerfile; echo "=====" # FIXME: debug + - echo "cat Dockerfile"; cat Dockerfile; echo "=====" - docker build -t ltp . script:
@@ -98,4 +98,4 @@ script: - INSTALL="${INSTALL%%/*}" - if [ ! "$TREE" ]; then TREE="in"; fi - case $VARIANT in cross-compile*) BUILD="cross";; i386) BUILD="32";; *) BUILD="native";; esac - - docker run -t ltp /bin/sh -c "cd travis && ./$INSTALL.sh && if [ \"$VARIANT\" ]; then ARCH=\"$ARCH\" ./$INSTALL.$VARIANT.sh; fi && ../build.sh -o $TREE -t $BUILD -c $CC" + - docker run -t ltp /bin/sh -c "cd travis && RPC=\"$RPC\" ./$INSTALL.sh && if [ \"$VARIANT\" ]; then ARCH=\"$ARCH\" RPC=\"$RPC\" ./$INSTALL.$VARIANT.sh; fi && ../build.sh -o $TREE -t $BUILD -c $CC"
travis/debian.cross-compile.sh +8 -2
@@ -2,7 +2,7 @@ # Copyright (c) 2018-2020 Petr Vorel <[email protected]> set -e -if [ -z "$ARCH" ]; +if [ -z "$ARCH" ]; then echo "missing \$ARCH!" exit 1 fi
@@ -10,7 +10,13 @@ fi dpkg --add-architecture $ARCH apt update +EXTRA_PACKAGES="libtirpc-dev:$ARCH" +case "$RPC" in +libntirpc) EXTRA_PACKAGES="libntirpc-dev:$ARCH";; +none) EXTRA_PACKAGES=;; +esac + apt install -y --no-install-recommends \ gcc-${ARCH}-linux-gnu \ libc6-dev-${ARCH}-cross \ - libtirpc-dev:${ARCH} + $EXTRA_PACKAGES
travis/debian.sh +8 -2
@@ -8,6 +8,12 @@ grep -v oldstable-updates /etc/apt/sources.list > /tmp/sources.list && mv /tmp/s apt update +EXTRA_PACKAGES="libtirpc-dev" +case "$RPC" in +libntirpc) EXTRA_PACKAGES="libntirpc-dev";; +none) EXTRA_PACKAGES=;; +esac + apt install -y --no-install-recommends \ acl-dev \ autoconf \
@@ -33,7 +39,7 @@ apt install -y --no-install-recommends \ libselinux1-dev \ libsepol1-dev \ libssl-dev \ - libtirpc-dev \ linux-libc-dev \ lsb-release \ - pkg-config + pkg-config \ + $EXTRA_PACKAGES
travis/fedora.sh +8 -3
@@ -2,6 +2,12 @@ # Copyright (c) 2018-2020 Petr Vorel <[email protected]> set -e +EXTRA_PACKAGES="libtirpc-devel" +case "$RPC" in +libntirpc) EXTRA_PACKAGES="libntirpc-devel";; +none) EXTRA_PACKAGES=;; +esac + yum -y install \ autoconf \ automake \
@@ -9,7 +15,6 @@ yum -y install \ clang \ gcc \ findutils \ - libtirpc \ - libtirpc-devel \ pkg-config \ - redhat-lsb-core + redhat-lsb-core \ + $EXTRA_PACKAGES
Signature · 1 line
2.24.1
cover TI-RPC: enhancements (pkg-config, libntirpc, travis)
In reply to Petr VorelHi!
I've looked over the patchset and it looks fine to me, acked.
Signature · 2 lines
Cyril Hrubis [email protected]
cover TI-RPC: enhancements (pkg-config, libntirpc, travis)
Hi Cyril,
Quoted 2 lines
Hi!
I've looked over the patchset and it looks fine to me, acked.
Thanks for your review and ack.
Unfortunately there are errors, so I'm working on v2.
Missing AC_SUBST in first patch for TI-RPC CFLAGS and LIBS hide them, when fixed it shows that TI-RPC is really just for libtirpc - not for glibc nor for libntirpc due missing xdr_{u_,}char dependency (although I got some reply on ticket for libntirpc [1]: use xdr_get{u,}int8 and xdr_put{u,}int8 in libntirpc, so it might be fixed). This is dependency for both TI-RPC tests and basic RPC tests (testcases/network/rpc/basic_tests). libntirpc might have also some missing dependency for TI-RPC (pmap_unset, which is in glibc).
I still don't know whether current goal for libntirpc is to be API compatible with libtirpc (similar to kerberos, which override libtirpc functions with it's gssrpc_* variants via gssrpc/rename.h [2]).
On the other hand svc_unreg() is in both libtirpc and libntirpc, but missing in glibc.
But I'm going to merge commit travis: Merge debian.cross-compile.*.sh which is correct.
BTW I also get some "funny" errors on s390 on travis [3]:
install: error writing '/root/ltp-install/testcases/bin/mkdir05': No space left on device (I never experienced lack of space on travis on intel, I guess non-intel archs are a bit experimental.)
Kind regards,
Petr
[1] https://github.com/nfs-ganesha/ntirpc/issues/200
[2] https://github.com/krb5/krb5/blob/master/src/include/gssrpc/rename.h
[3] https://api.travis-ci.org/v3/job/640230579/log.txt