From 526d7f22830e249470e0544702ee88eaa20347b9 Mon Sep 17 00:00:00 2001
From: Philip Chimento <philip.chimento@gmail.com>
Date: Sat, 28 Jul 2018 21:50:02 -0400
Subject: [PATCH 1/2] build: Fix distcheck

The debugger test runner script was not included in the tarball, which
made the tests fail during distcheck.

Unreviewed, pushing to fix build.
---
 Makefile-test.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile-test.am b/Makefile-test.am
index 4ae22eea0..1bdfa5e6b 100644
--- a/Makefile-test.am
+++ b/Makefile-test.am
@@ -342,6 +342,7 @@ JS_LOG_COMPILER = $$LOG_COMPILER $$LOG_FLAGS $(top_builddir)/minijasmine
 
 DEBUGGER_LOG_DRIVER = $(LOG_DRIVER)
 DEBUGGER_LOG_COMPILER = $(top_srcdir)/installed-tests/debugger-test.sh
+EXTRA_DIST += installed-tests/debugger-test.sh
 
 CODE_COVERAGE_IGNORE_PATTERN = */{include,mfbt,gjs/test}/*
 CODE_COVERAGE_GENHTML_OPTIONS = 			\
-- 
GitLab


From 118cb7feebbcc260499aa3eeb945618a543d0839 Mon Sep 17 00:00:00 2001
From: Philip Chimento <philip.chimento@gmail.com>
Date: Sat, 28 Jul 2018 21:51:00 -0400
Subject: [PATCH 2/2] CI: Add ninja-build explicitly to Ubuntu images

On the 18.04 LTS image, this is needed by jhbuild, so make sure it's
included.

Unreviewed.
---
 test/extra/do_basic.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/extra/do_basic.sh b/test/extra/do_basic.sh
index 04d0108f3..338b5d127 100755
--- a/test/extra/do_basic.sh
+++ b/test/extra/do_basic.sh
@@ -9,7 +9,7 @@ function do_Install_Dependencies(){
 
         # Base dependencies
         apt-get -y     install build-essential git clang patch bison flex \
-                               python-dev python3-dev \
+                               ninja-build python-dev python3-dev \
                                autotools-dev autoconf gettext pkgconf autopoint yelp-tools \
                                docbook docbook-xsl libtext-csv-perl \
                                zlib1g-dev libdbus-glib-1-dev \
-- 
GitLab