From a4ac43e4d4a18cfef9b21c68d0c443c5718b9a76 Mon Sep 17 00:00:00 2001
From: Jeff Kaufman <jeff@jefftk.com>
Date: Mon, 19 Dec 2016 13:21:33 -0500
Subject: [PATCH] travis: get it building and passing tests (#1339)

* travis: get it building and passing tests

I initially planned to get this working on Ubuntu 12, but decided it wasn't
worth it and switched to Ubuntu 14 (Trusty).  Now it passes tests on Travis, so
I've added other people's emails back to the set of people to send emails to.

Also update mps while we're at it.

* update mps

* update mps

* ngx_pagespeed depends on luuid

* update mps
---
 .travis.yml                        | 8 ++++++++
 config                             | 2 +-
 testing-dependencies/mod_pagespeed | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b722a04bb..65f6ea3ab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,9 @@ env:
 #   jobs=8: 179s (29s to install new git, 150s to run the downloads)
 # We can't use --depth=1, though, because github doesn't have
 # allowReachableSHA1InWant set.
+#
+# TODO(jefftk): once we're running on a server with git 2.8 or later we can have
+#               --jobs without installing a new git.
 git:
   submodules: false
 before_install:
@@ -21,9 +24,14 @@ install:
 script:
   test/run_tests.sh $PWD/testing-dependencies/mod_pagespeed/ \
                     $PWD/nginx/sbin/nginx
+dist: trusty
 sudo: required
 compiler:
   - gcc
 notifications:
   email:
+    - cheesy@google.com
     - jefftk@google.com
+    - morlovich@google.com
+    - jmarantz@google.com
+    - huibao@google.com
diff --git a/config b/config
index b63f73089..5d1792a49 100644
--- a/config
+++ b/config
@@ -198,7 +198,7 @@ pagespeed_include="\
   $mod_pagespeed_dir/url"
 ngx_feature_path="$pagespeed_include"
 
-pagespeed_libs="$psol_binary $pagespeed_libs -lrt -pthread -lm"
+pagespeed_libs="$psol_binary $pagespeed_libs -lrt -pthread -lm -luuid"
 ngx_feature_libs="$pagespeed_libs"
 ngx_feature_test="
 
diff --git a/testing-dependencies/mod_pagespeed b/testing-dependencies/mod_pagespeed
index 91662d08a..f61c3a5c4 160000
--- a/testing-dependencies/mod_pagespeed
+++ b/testing-dependencies/mod_pagespeed
@@ -1 +1 @@
-Subproject commit 91662d08ae6653b459372daff69bd7cd3bb0589f
+Subproject commit f61c3a5c4e69998a36fa696e4496955ee375efc0