From da0049d5dabc12141a113363d029c67da40203af Mon Sep 17 00:00:00 2001
From: Martin Feckie <mfeckie@gmail.com>
Date: Sat, 21 Nov 2015 19:44:10 +0501
Subject: [PATCH] servo: Merge #8601 - Check if MANIFEST.json changes as per
 #8587 (from mfeckie:feature/manifest-diff-ci-check); r=jdm

Adds a script which checks if either of the MANIFEST.json files change in `test/wpt` in response to #8587

- Addresses currently incorrect MANIFEST.json
- Adds checking script

PR for saltfs to add to CI checks to follow (https://github.com/servo/saltfs/pull/163)

https://reviewable.io/reviews/servo/servo/8601

Source-Repo: https://github.com/servo/servo
Source-Revision: f2fe1171d2a4f4ae37cfa0e0e345662f68e41c5d
---
 servo/.travis.yml                | 1 +
 servo/etc/ci/manifest_changed.sh | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 100755 servo/etc/ci/manifest_changed.sh

diff --git a/servo/.travis.yml b/servo/.travis.yml
index 81f6dc4aba82..8b64d02477b2 100644
--- a/servo/.travis.yml
+++ b/servo/.travis.yml
@@ -11,6 +11,7 @@ matrix:
       script:
          - ./mach build -d --verbose
          - bash etc/ci/lockfile_changed.sh
+         - bash etc/ci/manifest_changed.sh          
       cache:
         directories:
           - .cargo
diff --git a/servo/etc/ci/manifest_changed.sh b/servo/etc/ci/manifest_changed.sh
new file mode 100755
index 000000000000..7ad9efa0821d
--- /dev/null
+++ b/servo/etc/ci/manifest_changed.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+./mach test-wpt --manifest-update SKIP_TESTS > /dev/null
+./mach test-css --manifest-update SKIP_TESTS > /dev/null
+diff=$(git diff -- tests/*/MANIFEST.json)
+echo "$diff"
+[[ ! $diff ]]