Tests: do not install test scripts

Using "check_" instead of "bin_" in the Makefile.am forces libtool to
link against the libaccounts-glib found in the working tree, and not
against the system one.
This allows us to run "make check" locally.

diff --git a/configure.ac b/configure.ac
index 57fab4a368f78e48416bfdbf9d10039f2a0e0c79..9ed76b17abc1a81629f10cb77020b15e462c419d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -58,11 +58,6 @@ PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.51, dbus-glib-1 >= 0.51], have_dbus=yes, ha
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
 
-testdatadir=${datadir}/libsignon-glib1-test
-AC_SUBST(testdatadir)
-
-AC_CONFIG_FILES([tests/signon-glib-test.sh], [chmod +x tests/signon-glib-test.sh])
-
 AC_OUTPUT([
        Makefile
        libsignon-glib/Makefile

diff --git a/tests/.gitignore b/tests/.gitignore
index 0cac1a74e1ffcb9057a5f19b496b9a44ef31c7ca..558248e51dfa0eb6b493fb005ab631eff5167856 100644 (file)
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,2 +1 @@
-/signon-glib-test.sh
 /signon-glib-testsuite

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 032a1da7d3269c50180487254d4a709b4e583e0a..df648c3925a70266eab0d1d88aa5089c8ade9213 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,9 +2,8 @@
 
 INCLUDES=-I$(top_srcdir) $(DEPS_CFLAGS)
 
-bin_PROGRAMS = signon-glib-testsuite
-bin_SCRIPTS = signon-glib-test.sh
-CLEANFILES = $(bin_SCRIPTS)
+check_PROGRAMS = signon-glib-testsuite
+check_SCRIPTS = signon-glib-test.sh
 
 signon_glib_testsuite_SOURCES = check_signon.c
 signon_glib_testsuite_CFLAGS = $(CHECK_FLAGS) -I$(top_srcdir)
@@ -14,8 +13,3 @@ signon_glib_testsuite_LDADD = \
        $(top_builddir)/libsignon-glib/libsignon-glib.la
 
 TESTS = signon-glib-testsuite
-
-testdata_DATA = tests.xml
-
-EXTRA_DIST = \
-       $(testdata_DATA)

diff --git a/tests/signon-glib-test.sh b/tests/signon-glib-test.sh
new file mode 100755 (executable)
index 0000000..c2b45dc
--- /dev/null
+++ b/tests/signon-glib-test.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+export G_MESSAGES_DEBUG=all
+
+signon-glib-testsuite

diff --git a/tests/signon-glib-test.sh.in b/tests/signon-glib-test.sh.in
deleted file mode 100644 (file)
index a3a1d22..0000000
--- a/tests/signon-glib-test.sh.in
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-prefix=@prefix@
-datarootdir=@datarootdir@
-datadir=@datadir@
-export G_LOG_DIRECT=1
-signon-glib-testsuite