[PATCH] libosmocore[master]: tests/conv: move conv.h to the global include dir

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Vadim Yanitskiy gerrit-no-reply at lists.osmocom.org
Tue Mar 14 18:30:45 UTC 2017


Review at  https://gerrit.osmocom.org/2075

tests/conv: move conv.h to the global include dir

Build from different directory will fail, if there are any generated
files, which include the 'conv.h'. So, this change separates headers
from sources, allowing to include them from any place.

Change-Id: I414223f3d9382642fc4f7efb3b35dc950eaaad86
---
M include/Makefile.am
R include/osmocom/tests/conv.h
M tests/Makefile.am
M tests/conv/conv.c
M tests/conv/conv_test.c
M utils/conv_gen.py
6 files changed, 5 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/75/2075/1

diff --git a/include/Makefile.am b/include/Makefile.am
index f8b1f8f..0609f05 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -139,7 +139,8 @@
 
 noinst_HEADERS = \
 	osmocom/core/timer_compat.h \
-	osmocom/gsm/kasumi.h osmocom/gsm/gea.h
+	osmocom/gsm/kasumi.h osmocom/gsm/gea.h \
+	osmocom/tests/conv.h
 
 osmocom/core/bit%gen.h: osmocom/core/bitXXgen.h.tpl
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@)
diff --git a/tests/conv/conv.h b/include/osmocom/tests/conv.h
similarity index 100%
rename from tests/conv/conv.h
rename to include/osmocom/tests/conv.h
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 496ed65..69e23b1 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -195,7 +195,6 @@
 	     socket/socket_test.err coding/coding_test.ok
 
 DISTCLEANFILES = atconfig atlocal
-noinst_HEADERS = conv/conv.h
 
 TESTSUITE = $(srcdir)/testsuite
 
diff --git a/tests/conv/conv.c b/tests/conv/conv.c
index 7dac155..f192863 100644
--- a/tests/conv/conv.c
+++ b/tests/conv/conv.c
@@ -6,8 +6,7 @@
 #include <osmocom/core/bits.h>
 #include <osmocom/core/conv.h>
 #include <osmocom/core/utils.h>
-
-#include "conv.h"
+#include <osmocom/tests/conv.h>
 
 static void fill_random(ubit_t *b, int n)
 {
diff --git a/tests/conv/conv_test.c b/tests/conv/conv_test.c
index 131b459..5bb3ff8 100644
--- a/tests/conv/conv_test.c
+++ b/tests/conv/conv_test.c
@@ -3,8 +3,7 @@
 
 #include <osmocom/core/conv.h>
 #include <osmocom/gsm/gsm0503.h>
-
-#include "conv.h"
+#include <osmocom/tests/conv.h>
 
 /* ------------------------------------------------------------------------ */
 /* Test codes                                                               */
diff --git a/utils/conv_gen.py b/utils/conv_gen.py
index 1ffeb3f..ea804c6 100644
--- a/utils/conv_gen.py
+++ b/utils/conv_gen.py
@@ -343,7 +343,7 @@
 		for item in inc:
 			f.write("%s\n" % item)
 	f.write("#include <osmocom/core/conv.h>\n")
-	f.write("#include \"conv.h\"\n\n")
+	f.write("#include <osmocom/tests/conv.h>\n\n")
 
 	sys.stderr.write("Generating test vectors...\n")
 

-- 
To view, visit https://gerrit.osmocom.org/2075
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I414223f3d9382642fc4f7efb3b35dc950eaaad86
Gerrit-PatchSet: 1
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Vadim Yanitskiy <axilirator at gmail.com>



More information about the gerrit-log mailing list