aboutsummaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorLars Volker <lv@cloudera.com>2018-01-31 13:29:11 -0800
committerTed Mielczarek <ted@mielczarek.org>2018-02-20 11:08:52 +0000
commit49907e1c3457570f56d959ae26dec6c3a5edd417 (patch)
treef969036a1913824c314ea27a55ac244bdd416cc1 /Makefile.am
parentFix crash when an NSException is thrown. (diff)
downloadbreakpad-49907e1c3457570f56d959ae26dec6c3a5edd417.tar.xz
Fix Travis build by running tests as root
A recent configuration change made it necessary to run our tests on Travis as root. This change also increases the timeout of ParallelChildCrashesDontHang to make it pass in Travis virtualized containers. Bug: google-breakpad:753 Change-Id: I6ca8ff4513c6ea3e0646f22457f28b5c4fca6654 Reviewed-on: https://chromium-review.googlesource.com/890564 Reviewed-by: Mike Frysinger <vapier@chromium.org>
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 21e5867a..eac914cf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -446,8 +446,12 @@ if ANDROID_HOST
LOG_DRIVER = $(top_srcdir)/android/test-driver
else
# The default Autotools test driver script.
+if TESTS_AS_ROOT
+LOG_DRIVER = $(top_srcdir)/autotools/root-test-driver $(top_srcdir)/autotools/test-driver
+else
LOG_DRIVER = $(top_srcdir)/autotools/test-driver
-endif
+endif !TESTS_AS_ROOT
+endif !ANDROID_HOST
if LINUX_HOST
src_client_linux_linux_dumper_unittest_helper_SOURCES = \