diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-06-11 15:48:20 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-06-11 15:48:20 +0100 |
| commit | 66733cb8347bbc541dadd87936127f9d73e479bf (patch) | |
| tree | 741e192389d05c772cd4dcc9124f843e5c5e3f33 /tests | |
| parent | a4552870397dfad0f6f76e64e1f030845236cd98 (diff) | |
| parent | a95947e2e2ad6724c6b1e74910354fb0fa4897e1 (diff) | |
| download | telepathy-glib-66733cb8347bbc541dadd87936127f9d73e479bf.tar.gz | |
Merge branch 'telepathy-glib-0.20'
Conflicts:
NEWS
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/tools/Makefile.am | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | tests/tools/test-glib-gtypes-generator.sh | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | tests/tools/test-gobject-foo.sh | 0 |
3 files changed, 1 insertions, 1 deletions
diff --git a/tests/tools/Makefile.am b/tests/tools/Makefile.am index f86d20ded..4a7de16cb 100644 --- a/tests/tools/Makefile.am +++ b/tests/tools/Makefile.am @@ -16,7 +16,7 @@ TESTS_ENVIRONMENT = \ PYTHON=$(PYTHON) \ srcdir=$(srcdir) \ top_srcdir=$(top_srcdir) \ - sh + $(NULL) CLEANFILES = \ actual.h \ diff --git a/tests/tools/test-glib-gtypes-generator.sh b/tests/tools/test-glib-gtypes-generator.sh index 0230cd1a2..0230cd1a2 100644..100755 --- a/tests/tools/test-glib-gtypes-generator.sh +++ b/tests/tools/test-glib-gtypes-generator.sh diff --git a/tests/tools/test-gobject-foo.sh b/tests/tools/test-gobject-foo.sh index 6bce48c65..6bce48c65 100644..100755 --- a/tests/tools/test-gobject-foo.sh +++ b/tests/tools/test-gobject-foo.sh |