pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/32609 )
Change subject: Move testdir src/tests/ -> tests/ ......................................................................
Move testdir src/tests/ -> tests/
Move tests to usual directory in most projects.
Change-Id: Ib9ca59d1dffbbb13fcb9ae2e597b3f114f77524e --- M .gitignore M Makefile.am M configure.ac M src/Makefile.am R tests/Makefile.am R tests/dummy_cn_sua.c R tests/hnb-test-layers.h R tests/hnb-test-ranap.c R tests/hnb-test-rua.c R tests/hnb-test.c R tests/hnb-test.h R tests/test-helpers.c R tests/test-helpers.err R tests/test-helpers.ok R tests/test-hnbap.c R tests/test-hnbap.ok R tests/test-ranap.c R tests/test-ranap.ok R tests/test_common.c R tests/test_common.h R tests/testsuite.at 21 files changed, 29 insertions(+), 18 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/09/32609/1
diff --git a/.gitignore b/.gitignore index 91912b2..209421b 100644 --- a/.gitignore +++ b/.gitignore @@ -21,16 +21,16 @@ Makefile.in Makefile Makefile.am.sample -src/tests/atconfig -src/tests/dummy-cn -src/tests/hnb-test -src/tests/package.m4 -src/tests/test-helpers -src/tests/test-hnbap -src/tests/test-ranap -src/tests/testsuite -src/tests/testsuite.dir -src/tests/testsuite.log +tests/atconfig +tests/dummy-cn +tests/hnb-test +tests/package.m4 +tests/test-helpers +tests/test-hnbap +tests/test-ranap +tests/testsuite +tests/testsuite.dir +tests/testsuite.log src/osmo-hnbgw tags libosmo-hnbap.pc diff --git a/Makefile.am b/Makefile.am index ab3ed63..60fc0b6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2
-SUBDIRS = src include doc +SUBDIRS = src include doc tests
pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libosmo-hnbap.pc libosmo-ranap.pc libosmo-rua.pc libosmo-sabp.pc diff --git a/configure.ac b/configure.ac index 5596659..32f0a0d 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ dnl tar-ustar: some asn1 filenames surpass the 99 char limit of tar, so we need dnl to make tar allow longer filenames.
-AC_CONFIG_TESTDIR(src/tests) +AC_CONFIG_TESTDIR(tests)
CFLAGS="$CFLAGS -std=gnu11"
@@ -143,7 +143,7 @@ src/ranap/Makefile src/rua/Makefile src/sabp/Makefile - src/tests/Makefile + tests/Makefile Makefile include/Makefile include/osmocom/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index d217221..378262b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = hnbap rua ranap sabp tests +SUBDIRS = hnbap rua ranap sabp
# Build {hnbap,rua,ranap}_{encoder,decoder}.c using asn1tostruct ASN1_ROOT = $(top_srcdir)/asn1 diff --git a/src/tests/Makefile.am b/tests/Makefile.am similarity index 98% rename from src/tests/Makefile.am rename to tests/Makefile.am index 1fca2a4..c08c6d1 100644 --- a/src/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = -g -Wall -I$(top_srcdir)/src/tests \ +AM_CFLAGS = -g -Wall -I$(top_srcdir)/tests \ -I$(top_srcdir)/include -I$(top_builddir)/include \ $(OSMOVTY_CFLAGS) $(OSMOCORE_CFLAGS) $(OSMOGSM_CFLAGS) \ $(OSMONETIF_CFLAGS) $(ASN1C_CFLAGS) $(OSMOSIGTRAN_CFLAGS) diff --git a/src/tests/dummy_cn_sua.c b/tests/dummy_cn_sua.c similarity index 100% rename from src/tests/dummy_cn_sua.c rename to tests/dummy_cn_sua.c diff --git a/src/tests/hnb-test-layers.h b/tests/hnb-test-layers.h similarity index 100% rename from src/tests/hnb-test-layers.h rename to tests/hnb-test-layers.h diff --git a/src/tests/hnb-test-ranap.c b/tests/hnb-test-ranap.c similarity index 100% rename from src/tests/hnb-test-ranap.c rename to tests/hnb-test-ranap.c diff --git a/src/tests/hnb-test-rua.c b/tests/hnb-test-rua.c similarity index 100% rename from src/tests/hnb-test-rua.c rename to tests/hnb-test-rua.c diff --git a/src/tests/hnb-test.c b/tests/hnb-test.c similarity index 100% rename from src/tests/hnb-test.c rename to tests/hnb-test.c diff --git a/src/tests/hnb-test.h b/tests/hnb-test.h similarity index 100% rename from src/tests/hnb-test.h rename to tests/hnb-test.h diff --git a/src/tests/test-helpers.c b/tests/test-helpers.c similarity index 100% rename from src/tests/test-helpers.c rename to tests/test-helpers.c diff --git a/src/tests/test-helpers.err b/tests/test-helpers.err similarity index 100% rename from src/tests/test-helpers.err rename to tests/test-helpers.err diff --git a/src/tests/test-helpers.ok b/tests/test-helpers.ok similarity index 100% rename from src/tests/test-helpers.ok rename to tests/test-helpers.ok diff --git a/src/tests/test-hnbap.c b/tests/test-hnbap.c similarity index 100% rename from src/tests/test-hnbap.c rename to tests/test-hnbap.c diff --git a/src/tests/test-hnbap.ok b/tests/test-hnbap.ok similarity index 100% rename from src/tests/test-hnbap.ok rename to tests/test-hnbap.ok diff --git a/src/tests/test-ranap.c b/tests/test-ranap.c similarity index 100% rename from src/tests/test-ranap.c rename to tests/test-ranap.c diff --git a/src/tests/test-ranap.ok b/tests/test-ranap.ok similarity index 100% rename from src/tests/test-ranap.ok rename to tests/test-ranap.ok diff --git a/src/tests/test_common.c b/tests/test_common.c similarity index 100% rename from src/tests/test_common.c rename to tests/test_common.c diff --git a/src/tests/test_common.h b/tests/test_common.h similarity index 100% rename from src/tests/test_common.h rename to tests/test_common.h diff --git a/src/tests/testsuite.at b/tests/testsuite.at similarity index 63% rename from src/tests/testsuite.at rename to tests/testsuite.at index 9378f18..b0bd68f 100644 --- a/src/tests/testsuite.at +++ b/tests/testsuite.at @@ -6,17 +6,17 @@ AT_KEYWORDS([helpers]) cat $abs_srcdir/test-helpers.ok > expout cat $abs_srcdir/test-helpers.err > experr -AT_CHECK([$abs_top_builddir/src/tests/test-helpers], [0], [expout], [experr]) +AT_CHECK([$abs_top_builddir/tests/test-helpers], [0], [expout], [experr]) AT_CLEANUP
AT_SETUP([hnbap]) AT_KEYWORDS([hnbap]) cat $abs_srcdir/test-hnbap.ok > expout -AT_CHECK([$abs_top_builddir/src/tests/test-hnbap], [0], [expout]) +AT_CHECK([$abs_top_builddir/tests/test-hnbap], [0], [expout]) AT_CLEANUP
AT_SETUP([ranap]) AT_KEYWORDS([ranap]) cat $abs_srcdir/test-ranap.ok > expout -AT_CHECK([$abs_top_builddir/src/tests/test-ranap], [0], [expout]) +AT_CHECK([$abs_top_builddir/tests/test-ranap], [0], [expout]) AT_CLEANUP
-
pespin