diff options
| author | Ted Gould <ted@canonical.com> | 2009-05-11 13:29:10 -0500 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-05-11 13:29:10 -0500 |
| commit | ccd39004abc4c5ade0103a6cf17144443745f2cf (patch) | |
| tree | ad7d30c646672aa80727b87cab9ef0dd651ecd31 /tests | |
| parent | 29457ef539de25ce80f8bdb1d6ca0796fc5f1122 (diff) | |
| download | libdbusmenu-ccd39004abc4c5ade0103a6cf17144443745f2cf.tar.gz libdbusmenu-ccd39004abc4c5ade0103a6cf17144443745f2cf.tar.bz2 libdbusmenu-ccd39004abc4c5ade0103a6cf17144443745f2cf.zip | |
Moving the glib layout test into the make file
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 8 | ||||
| -rwxr-xr-x | tests/test.sh | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index a80f1d1..4f52706 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,3 +1,8 @@ +check: tests + +DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf + +tests: test-glib-layout libexec_PROGRAMS = \ glib-server-nomenu \ @@ -15,6 +20,9 @@ glib_server_nomenu_LDADD = \ ../libdbusmenu-glib/libdbusmenu-glib.la \ $(DBUSMENUGLIB_LIBS) +test-glib-layout: test-glib-layout-client test-glib-layout-server + $(DBUS_RUNNER) --task ./test-glib-layout-client --task ./test-glib-layout-server + test_glib_layout_server_SOURCES = \ test-glib-layout-server.c diff --git a/tests/test.sh b/tests/test.sh deleted file mode 100755 index ea31515..0000000 --- a/tests/test.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -echo dbus-test-runner -d /usr/share/dbus-test-runner/session.conf --task ./test-glib-layout-client --task ./test-glib-layout-server -dbus-test-runner -d /usr/share/dbus-test-runner/session.conf --task ./test-glib-layout-client --task ./test-glib-layout-server |