diff options
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index eb9b518d..002c5566 100644 --- a/Makefile.am +++ b/Makefile.am @@ -334,10 +334,14 @@ endif TESTS = $(check_PROGRAMS) $(check_SCRIPTS) if ANDROID_HOST -# Wrapper script to run unit test programs on a connected Android device. -TESTS_ENVIRONMENT = $(top_srcdir)/android/test-shell.sh +# Since Autotools 1.2, tests are run through a special "test driver" script. +# Unfortunately, it's not possible anymore to specify an alternative shell to +# run them on connected devices, so use a slightly modified version of the +# driver for Android. +LOG_DRIVER = $(top_srcdir)/android/test-driver else -TESTS_ENVIRONMENT = +# The default Autotools test driver script. +LOG_DRIVER = $(top_srcdir)/autotools/test-driver endif if LINUX_HOST |