aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <holger@moiji-mobile.com>2014-05-22 17:19:15 +0200
committerHolger Hans Peter Freyther <holger@moiji-mobile.com>2014-05-22 17:25:57 +0200
commit153f5856607b75ca76c540288cd6b4df144290ff (patch)
tree50908f5f1b9b6dbbc11548ba4354c6b1a88405a7
parentab9f17341eb520b75683bc40fada3e283e6f610d (diff)
misc: Fix distcheck and refer to the right file0.0.3
-rw-r--r--tests/Makefile.am7
-rw-r--r--tests/osmux/osmux_test.ok (renamed from tests/osmux/osmux-test.ok)0
-rw-r--r--tests/testsuite.at2
3 files changed, 5 insertions, 4 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 96c6a1a..0c1fed3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,9 +1,10 @@
-AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include
+AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include $(LIBOSMOCORE_CFLAGS)
+AM_LDFLAGS = $(LIBOSMOCORE_LDFLAGS)
check_PROGRAMS = osmux/osmux_test
osmux_osmux_test_SOURCES = osmux/osmux_test.c
-osmux_osmux_test_LDADD = -losmocore $(top_builddir)/src/libosmonetif.la
+osmux_osmux_test_LDADD = $(LIBOSMOCORE_LIBS) $(top_builddir)/src/libosmonetif.la
# The `:;' works around a Bash 3.2 bug when the output is not writeable.
$(srcdir)/package.m4: $(top_srcdir)/configure.ac
@@ -24,7 +25,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
} >'$(srcdir)/package.m4'
EXTRA_DIST = testsuite.at $(srcdir)/package.m4 $(TESTSUITE) \
- osmux_test.ok
+ osmux/osmux_test.ok
DISTCLEANFILES = atconfig
diff --git a/tests/osmux/osmux-test.ok b/tests/osmux/osmux_test.ok
index 0f65527..0f65527 100644
--- a/tests/osmux/osmux-test.ok
+++ b/tests/osmux/osmux_test.ok
diff --git a/tests/testsuite.at b/tests/testsuite.at
index b3bc50f..d0e55f6 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -3,6 +3,6 @@ AT_BANNER([Regression tests.])
AT_SETUP([osmux_test])
AT_KEYWORDS([osmux_test])
-cat $abs_srcdir/osmux/osmux-test.ok > expout
+cat $abs_srcdir/osmux/osmux_test.ok > expout
AT_CHECK([$abs_top_builddir/tests/osmux/osmux_test], [0], [expout], [ignore])
AT_CLEANUP