Move testdir src/tests/ -> tests/

Move tests to usual directory in most projects. Change-Id: Ib9ca59d1dffbbb13fcb9ae2e597b3f114f77524e
2023-05-04 16:18:20 +02:00 · 2023-05-04 16:18:20 +02:00 · 0ded29a701
parent 520c406b85
commit 0ded29a701
21 changed files with 18 additions and 18 deletions
--- a/.gitignore
+++ b/.gitignore
@ -21,16 +21,16 @@ missing
 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
--- 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
--- a/configure.ac
+++ b/configure.ac
@ -11,7 +11,7 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip 1.9 tar-ustar])
 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 @@ AC_OUTPUT(
 	src/ranap/Makefile
 	src/rua/Makefile
 	src/sabp/Makefile
-	src/tests/Makefile
+	tests/Makefile
 	Makefile
 	include/Makefile
 	include/osmocom/Makefile
--- 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
--- a/src/tests/Makefile.am
+++ b/src/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)
--- a/src/tests/dummy_cn_sua.c
+++ b/src/tests/dummy_cn_sua.c
--- a/src/tests/hnb-test-layers.h
+++ b/src/tests/hnb-test-layers.h
--- a/src/tests/hnb-test-ranap.c
+++ b/src/tests/hnb-test-ranap.c
--- a/src/tests/hnb-test-rua.c
+++ b/src/tests/hnb-test-rua.c
--- a/src/tests/hnb-test.c
+++ b/src/tests/hnb-test.c
--- a/src/tests/hnb-test.h
+++ b/src/tests/hnb-test.h
--- a/src/tests/test-helpers.c
+++ b/src/tests/test-helpers.c
--- a/src/tests/test-helpers.err
+++ b/src/tests/test-helpers.err
--- a/src/tests/test-helpers.ok
+++ b/src/tests/test-helpers.ok
--- a/src/tests/test-hnbap.c
+++ b/src/tests/test-hnbap.c
--- a/src/tests/test-hnbap.ok
+++ b/src/tests/test-hnbap.ok
--- a/src/tests/test-ranap.c
+++ b/src/tests/test-ranap.c
--- a/src/tests/test-ranap.ok
+++ b/src/tests/test-ranap.ok
--- a/src/tests/test_common.c
+++ b/src/tests/test_common.c
--- a/src/tests/test_common.h
+++ b/src/tests/test_common.h
--- a/src/tests/testsuite.at
+++ b/src/tests/testsuite.at
@ -6,17 +6,17 @@ AT_SETUP([helpers])
 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