All of lore.kernel.org
 help / color / mirror / Atom feed
* [LTP] [COMMITTED] [PATCH 1/4] lib: Move ltp_priv.h to include/old/ltp_priv.h
@ 2017-03-29 13:55 Cyril Hrubis
  2017-03-29 13:55 ` [LTP] [COMMITTED] [PATCH 2/4] rpc-tirpc: Fix out-of-tree build Cyril Hrubis
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Cyril Hrubis @ 2017-03-29 13:55 UTC (permalink / raw)
  To: ltp

Fixes out-of-tree build since ltp_priv.h is included from
include/old/test.h and the lib/ directory is not in the compiler search
path nor it's a file in the same directory in case of out-of-tree build.

Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
---
 {lib => include/old}/ltp_priv.h | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {lib => include/old}/ltp_priv.h (100%)

diff --git a/lib/ltp_priv.h b/include/old/ltp_priv.h
similarity index 100%
rename from lib/ltp_priv.h
rename to include/old/ltp_priv.h
-- 
2.10.2


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [LTP] [COMMITTED] [PATCH 2/4] rpc-tirpc: Fix out-of-tree build
  2017-03-29 13:55 [LTP] [COMMITTED] [PATCH 1/4] lib: Move ltp_priv.h to include/old/ltp_priv.h Cyril Hrubis
@ 2017-03-29 13:55 ` Cyril Hrubis
  2017-03-29 13:55 ` [LTP] [COMMITTED] [PATCH 3/4] commands: Fix out-of-tree datafiles installation Cyril Hrubis
  2017-03-29 13:55 ` [LTP] [COMMITTED] [PATCH 4/4] lib/tst_safe_posix_ipc.c: Add licence Cyril Hrubis
  2 siblings, 0 replies; 4+ messages in thread
From: Cyril Hrubis @ 2017-03-29 13:55 UTC (permalink / raw)
  To: ltp

* Make use of $(abs_srcdir) when including Makefile.inc

* Fix typo in Makefile.inc

Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
---
 testcases/network/rpc/rpc-tirpc/tests_pack/Makefile              | 2 +-
 testcases/network/rpc/rpc-tirpc/tests_pack/Makefile.inc          | 2 +-
 testcases/network/rpc/rpc-tirpc/tests_pack/rpc_svc_1/Makefile    | 2 +-
 testcases/network/rpc/rpc-tirpc/tests_pack/rpc_svc_2/Makefile    | 2 +-
 testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_1/Makefile  | 2 +-
 testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_11/Makefile | 2 +-
 testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_2/Makefile  | 2 +-
 testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_3/Makefile  | 2 +-
 testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_4/Makefile  | 2 +-
 testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_5/Makefile  | 2 +-
 testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_6/Makefile  | 2 +-
 testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_7/Makefile  | 2 +-
 testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_8/Makefile  | 2 +-
 testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_9/Makefile  | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/Makefile b/testcases/network/rpc/rpc-tirpc/tests_pack/Makefile
index d16e1ca..42d111f 100644
--- a/testcases/network/rpc/rpc-tirpc/tests_pack/Makefile
+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/Makefile
@@ -35,5 +35,5 @@ trunk-clean:: | lib-clean
 lib-clean:: $(LIBDIR)
 	$(MAKE) -C $^ -f "$(abs_srcdir)/$^/Makefile" clean
 
-include ./Makefile.inc
+include $(abs_srcdir)/Makefile.inc
 include $(top_srcdir)/include/mk/generic_trunk_target.mk
diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/Makefile.inc b/testcases/network/rpc/rpc-tirpc/tests_pack/Makefile.inc
index ff6b2e0..c709335 100644
--- a/testcases/network/rpc/rpc-tirpc/tests_pack/Makefile.inc
+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/Makefile.inc
@@ -21,7 +21,7 @@ LIBDIR		:= $(abs_top_builddir)/$(LIBRELDIR)
 LIBSRCDIR	:= $(abs_top_srcdir)/$(LIBRELDIR)
 LIBRPC-TIRPC	:= $(LIBDIR)/librpc-tirpc.a
 
-$(LIBDDIR):
+$(LIBDIR):
 	mkdir -p "$@"
 
 $(LIBRPC-TIRPC): $(LIBDIR)
diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_svc_1/Makefile b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_svc_1/Makefile
index 771888c..b5d08aa 100644
--- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_svc_1/Makefile
+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_svc_1/Makefile
@@ -19,5 +19,5 @@
 top_srcdir		?= ../../../../../..
 
 include	$(top_srcdir)/include/mk/env_pre.mk
-include ../Makefile.inc
+include $(abs_srcdir)/../Makefile.inc
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_svc_2/Makefile b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_svc_2/Makefile
index 771888c..b5d08aa 100644
--- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_svc_2/Makefile
+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_svc_2/Makefile
@@ -19,5 +19,5 @@
 top_srcdir		?= ../../../../../..
 
 include	$(top_srcdir)/include/mk/env_pre.mk
-include ../Makefile.inc
+include $(abs_srcdir)/../Makefile.inc
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_1/Makefile b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_1/Makefile
index 771888c..b5d08aa 100644
--- a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_1/Makefile
+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_1/Makefile
@@ -19,5 +19,5 @@
 top_srcdir		?= ../../../../../..
 
 include	$(top_srcdir)/include/mk/env_pre.mk
-include ../Makefile.inc
+include $(abs_srcdir)/../Makefile.inc
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_11/Makefile b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_11/Makefile
index 771888c..b5d08aa 100644
--- a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_11/Makefile
+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_11/Makefile
@@ -19,5 +19,5 @@
 top_srcdir		?= ../../../../../..
 
 include	$(top_srcdir)/include/mk/env_pre.mk
-include ../Makefile.inc
+include $(abs_srcdir)/../Makefile.inc
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_2/Makefile b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_2/Makefile
index 771888c..b5d08aa 100644
--- a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_2/Makefile
+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_2/Makefile
@@ -19,5 +19,5 @@
 top_srcdir		?= ../../../../../..
 
 include	$(top_srcdir)/include/mk/env_pre.mk
-include ../Makefile.inc
+include $(abs_srcdir)/../Makefile.inc
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_3/Makefile b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_3/Makefile
index 771888c..b5d08aa 100644
--- a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_3/Makefile
+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_3/Makefile
@@ -19,5 +19,5 @@
 top_srcdir		?= ../../../../../..
 
 include	$(top_srcdir)/include/mk/env_pre.mk
-include ../Makefile.inc
+include $(abs_srcdir)/../Makefile.inc
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_4/Makefile b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_4/Makefile
index 771888c..b5d08aa 100644
--- a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_4/Makefile
+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_4/Makefile
@@ -19,5 +19,5 @@
 top_srcdir		?= ../../../../../..
 
 include	$(top_srcdir)/include/mk/env_pre.mk
-include ../Makefile.inc
+include $(abs_srcdir)/../Makefile.inc
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_5/Makefile b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_5/Makefile
index 771888c..b5d08aa 100644
--- a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_5/Makefile
+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_5/Makefile
@@ -19,5 +19,5 @@
 top_srcdir		?= ../../../../../..
 
 include	$(top_srcdir)/include/mk/env_pre.mk
-include ../Makefile.inc
+include $(abs_srcdir)/../Makefile.inc
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_6/Makefile b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_6/Makefile
index 771888c..b5d08aa 100644
--- a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_6/Makefile
+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_6/Makefile
@@ -19,5 +19,5 @@
 top_srcdir		?= ../../../../../..
 
 include	$(top_srcdir)/include/mk/env_pre.mk
-include ../Makefile.inc
+include $(abs_srcdir)/../Makefile.inc
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_7/Makefile b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_7/Makefile
index 771888c..b5d08aa 100644
--- a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_7/Makefile
+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_7/Makefile
@@ -19,5 +19,5 @@
 top_srcdir		?= ../../../../../..
 
 include	$(top_srcdir)/include/mk/env_pre.mk
-include ../Makefile.inc
+include $(abs_srcdir)/../Makefile.inc
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_8/Makefile b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_8/Makefile
index 771888c..b5d08aa 100644
--- a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_8/Makefile
+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_8/Makefile
@@ -19,5 +19,5 @@
 top_srcdir		?= ../../../../../..
 
 include	$(top_srcdir)/include/mk/env_pre.mk
-include ../Makefile.inc
+include $(abs_srcdir)/../Makefile.inc
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_9/Makefile b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_9/Makefile
index 771888c..b5d08aa 100644
--- a/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_9/Makefile
+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/tirpc_svc_9/Makefile
@@ -19,5 +19,5 @@
 top_srcdir		?= ../../../../../..
 
 include	$(top_srcdir)/include/mk/env_pre.mk
-include ../Makefile.inc
+include $(abs_srcdir)/../Makefile.inc
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
-- 
2.10.2


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [LTP] [COMMITTED] [PATCH 3/4] commands: Fix out-of-tree datafiles installation
  2017-03-29 13:55 [LTP] [COMMITTED] [PATCH 1/4] lib: Move ltp_priv.h to include/old/ltp_priv.h Cyril Hrubis
  2017-03-29 13:55 ` [LTP] [COMMITTED] [PATCH 2/4] rpc-tirpc: Fix out-of-tree build Cyril Hrubis
@ 2017-03-29 13:55 ` Cyril Hrubis
  2017-03-29 13:55 ` [LTP] [COMMITTED] [PATCH 4/4] lib/tst_safe_posix_ipc.c: Add licence Cyril Hrubis
  2 siblings, 0 replies; 4+ messages in thread
From: Cyril Hrubis @ 2017-03-29 13:55 UTC (permalink / raw)
  To: ltp

The INSTALL_TARGETS are prefixed with $(abs_srcdir) in the test library
hence we cannot do the wildcard expansion in the Makefile in case of
out-of-tree build and we have to leave that to the build system instead.

Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
---
 testcases/commands/ar/datafiles/Makefile   | 2 +-
 testcases/commands/file/datafiles/Makefile | 2 +-
 testcases/commands/ld/datafiles/Makefile   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/testcases/commands/ar/datafiles/Makefile b/testcases/commands/ar/datafiles/Makefile
index 09dc029..ef99bca 100644
--- a/testcases/commands/ar/datafiles/Makefile
+++ b/testcases/commands/ar/datafiles/Makefile
@@ -15,5 +15,5 @@ top_srcdir		?= ../../../..
 
 include $(top_srcdir)/include/mk/env_pre.mk
 INSTALL_DIR		:= testcases/data/ar01
-INSTALL_TARGETS		:= $(wildcard file*)
+INSTALL_TARGETS		:= file*
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/commands/file/datafiles/Makefile b/testcases/commands/file/datafiles/Makefile
index 6769fc6..d3cb847 100644
--- a/testcases/commands/file/datafiles/Makefile
+++ b/testcases/commands/file/datafiles/Makefile
@@ -15,5 +15,5 @@ top_srcdir		?= ../../../..
 
 include $(top_srcdir)/include/mk/env_pre.mk
 INSTALL_DIR		:= testcases/data/file01
-INSTALL_TARGETS		:= $(wildcard in*)
+INSTALL_TARGETS		:= in*
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/commands/ld/datafiles/Makefile b/testcases/commands/ld/datafiles/Makefile
index 7b19207..4eb64ad 100644
--- a/testcases/commands/ld/datafiles/Makefile
+++ b/testcases/commands/ld/datafiles/Makefile
@@ -17,6 +17,6 @@ include $(top_srcdir)/include/mk/env_pre.mk
 
 INSTALL_DIR		:= testcases/data/ld01
 MAKE_TARGETS		:=
-INSTALL_TARGETS		:= $(wildcard *.c)
+INSTALL_TARGETS		:= *.c
 
 include $(top_srcdir)/include/mk/generic_leaf_target.mk
-- 
2.10.2


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [LTP] [COMMITTED] [PATCH 4/4] lib/tst_safe_posix_ipc.c: Add licence.
  2017-03-29 13:55 [LTP] [COMMITTED] [PATCH 1/4] lib: Move ltp_priv.h to include/old/ltp_priv.h Cyril Hrubis
  2017-03-29 13:55 ` [LTP] [COMMITTED] [PATCH 2/4] rpc-tirpc: Fix out-of-tree build Cyril Hrubis
  2017-03-29 13:55 ` [LTP] [COMMITTED] [PATCH 3/4] commands: Fix out-of-tree datafiles installation Cyril Hrubis
@ 2017-03-29 13:55 ` Cyril Hrubis
  2 siblings, 0 replies; 4+ messages in thread
From: Cyril Hrubis @ 2017-03-29 13:55 UTC (permalink / raw)
  To: ltp

Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
 lib/tst_safe_posix_ipc.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/lib/tst_safe_posix_ipc.c b/lib/tst_safe_posix_ipc.c
index d9fbf77..7142a25 100644
--- a/lib/tst_safe_posix_ipc.c
+++ b/lib/tst_safe_posix_ipc.c
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2017 Petr Vorel <pvorel@suse.cz>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include <mqueue.h>
 #include <stdarg.h>
 
-- 
2.10.2


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2017-03-29 13:55 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-29 13:55 [LTP] [COMMITTED] [PATCH 1/4] lib: Move ltp_priv.h to include/old/ltp_priv.h Cyril Hrubis
2017-03-29 13:55 ` [LTP] [COMMITTED] [PATCH 2/4] rpc-tirpc: Fix out-of-tree build Cyril Hrubis
2017-03-29 13:55 ` [LTP] [COMMITTED] [PATCH 3/4] commands: Fix out-of-tree datafiles installation Cyril Hrubis
2017-03-29 13:55 ` [LTP] [COMMITTED] [PATCH 4/4] lib/tst_safe_posix_ipc.c: Add licence Cyril Hrubis

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.