From 7e5c45ddbf9bb5138f02f38adc93a95885d569df Mon Sep 17 00:00:00 2001 From: Martin Feckie Date: Thu, 19 Nov 2015 21:26:17 +1100 Subject: [PATCH 1/7] Commit autogenerated manifest for baseline position --- tests/wpt/metadata/MANIFEST.json | 2 +- tests/wpt/mozilla/meta/MANIFEST.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index 47106525131..32f8cbe9300 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -35511,4 +35511,4 @@ "rev": "5a754b40cd49c0404863c431b58cc311dc5d167c", "url_base": "/", "version": 2 -} \ No newline at end of file +} diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index fb9483e0ece..4b1e4e3da2d 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -9441,7 +9441,7 @@ "path": "css/viewport_ignore_desktop.html", "references": [ [ - "/_mozilla/css/viewport_ignore_desktop.html", + "/_mozilla/css/viewport_ignore_desktop_ref.html", "==" ] ], From cef839e4548f45b8eb2698e2c1ab0f5a66a120a5 Mon Sep 17 00:00:00 2001 From: Martin Feckie Date: Thu, 19 Nov 2015 22:17:29 +1100 Subject: [PATCH 2/7] Add script to check if MANIFEST.json files change --- etc/ci/manifest_changed.sh | 4 ++++ 1 file changed, 4 insertions(+) create mode 100755 etc/ci/manifest_changed.sh diff --git a/etc/ci/manifest_changed.sh b/etc/ci/manifest_changed.sh new file mode 100755 index 00000000000..6aeac707396 --- /dev/null +++ b/etc/ci/manifest_changed.sh @@ -0,0 +1,4 @@ +#!/bin/bash +diff=$(git diff -- tests/**/MANIFEST.json) +echo "$diff" +[[ ! $diff ]] From 3f34ee345e7b137847e2e22f9b16d0bae9a454c2 Mon Sep 17 00:00:00 2001 From: Martin Feckie Date: Thu, 19 Nov 2015 22:19:14 +1100 Subject: [PATCH 3/7] Add script to check if MANIFEST.json is changes in wpt --- etc/ci/manifest_changed.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/ci/manifest_changed.sh b/etc/ci/manifest_changed.sh index 6aeac707396..c596239f3d0 100755 --- a/etc/ci/manifest_changed.sh +++ b/etc/ci/manifest_changed.sh @@ -1,4 +1,4 @@ #!/bin/bash -diff=$(git diff -- tests/**/MANIFEST.json) +diff=$(git diff -- tests/wpt/**/MANIFEST.json) echo "$diff" [[ ! $diff ]] From 9c5e9dc96c79746f3b4945564fa048bb86dd61ed Mon Sep 17 00:00:00 2001 From: Martin Feckie Date: Sat, 21 Nov 2015 09:35:43 +1100 Subject: [PATCH 4/7] Run manifest-update without running tests prior to checking diff --- etc/ci/manifest_changed.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/etc/ci/manifest_changed.sh b/etc/ci/manifest_changed.sh index c596239f3d0..f1bbf0de254 100755 --- a/etc/ci/manifest_changed.sh +++ b/etc/ci/manifest_changed.sh @@ -1,4 +1,5 @@ #!/bin/bash -diff=$(git diff -- tests/wpt/**/MANIFEST.json) +./mach test-wpt --manifest-update SKIP_TESTS +diff=$(git diff --exit-code -- tests/**/MANIFEST.json) echo "$diff" [[ ! $diff ]] From a024c1c2962536c15bfd82ffe62675aa34e6d581 Mon Sep 17 00:00:00 2001 From: Martin Feckie Date: Sat, 21 Nov 2015 09:58:22 +1100 Subject: [PATCH 5/7] Only use single * and ignore mach output --- etc/ci/manifest_changed.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/ci/manifest_changed.sh b/etc/ci/manifest_changed.sh index f1bbf0de254..b8c2c536f54 100755 --- a/etc/ci/manifest_changed.sh +++ b/etc/ci/manifest_changed.sh @@ -1,5 +1,5 @@ #!/bin/bash -./mach test-wpt --manifest-update SKIP_TESTS -diff=$(git diff --exit-code -- tests/**/MANIFEST.json) +./mach test-wpt --manifest-update SKIP_TESTS > /dev/null +diff=$(git diff -- tests/*/MANIFEST.json) echo "$diff" [[ ! $diff ]] From 7fafc6c1f6477927ccb45ccfd6414d2aac2620f4 Mon Sep 17 00:00:00 2001 From: Martin Feckie Date: Sat, 21 Nov 2015 10:33:39 +1100 Subject: [PATCH 6/7] Also run checks for test-css MANIFEST.json --- etc/ci/manifest_changed.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/ci/manifest_changed.sh b/etc/ci/manifest_changed.sh index b8c2c536f54..7ad9efa0821 100755 --- a/etc/ci/manifest_changed.sh +++ b/etc/ci/manifest_changed.sh @@ -1,5 +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 ]] From 80721a64d0cfc7ec573f3c8b37d05a8d67d89c00 Mon Sep 17 00:00:00 2001 From: Martin Feckie Date: Sat, 21 Nov 2015 15:45:49 +1100 Subject: [PATCH 7/7] Add to manifest checks to .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 81f6dc4aba8..8b64d02477b 100644 --- a/.travis.yml +++ b/.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