Bug 1472037 [wpt PR 11715] - Make Mozilla's sync-tests.sh work with git. , a=testonly
authorEmilio Cobos Álvarez <emilio@crisal.io>
Fri, 06 Jul 2018 23:41:19 +0000
changeset 426111 bda209cd1ce0436052feeeefca61ea03f54831b1
parent 426110 667733c01f18f0f0a5f9f5291801aa31c23c5ae3
child 426112 c0dc8d28c6b9ac1e01660f7830e39d55baa43fcb
push id34267
push userrgurzau@mozilla.com
push dateWed, 11 Jul 2018 22:05:21 +0000
treeherdermozilla-central@3aca103e4915 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1472037, 11715
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1472037 [wpt PR 11715] - Make Mozilla's sync-tests.sh work with git. , a=testonly Automatic update from web-platform-testsMake sync-tests.sh work with git. -- Allow specifying the mozilla tree via argument. -- wpt-commits: 8b61c282650bf72bce0147df320425343ea27f2f, e639f5b4158852b16ffa28613730c2b0b63f5e83 wpt-pr: 11715
testing/web-platform/meta/MANIFEST.json
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/sync-tests.sh
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -562858,17 +562858,17 @@
    "8cdc9e68594fbb6db8c7b4bff643ab2432b51db6",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/sync-tests-filter": [
    "3055eafd3bf887f11c0c386419397910ad438d23",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/sync-tests.sh": [
-   "1c18dc5fdcddbbd08dbdc812f538a175e58892d7",
+   "97452f300fa818802eacf4d9b25d9c4428144110",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/text-decor-3/reftest.list": [
    "25c3ec740acaaed780e14a8544dcf4b66672f2d2",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/text-decor-3/ruby-text-decoration-01-ref.html": [
    "a339c6d5cccb565104de20c78f4e296a1a0ac946",
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/sync-tests.sh
+++ b/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/sync-tests.sh
@@ -1,17 +1,28 @@
 #!/bin/bash
 
-MOZTREE="$HOME/builds/clean-mozilla-central/mozilla/"
+if [ "x$1" != "x" ]; then
+  MOZTREE="$1"
+else
+  MOZTREE="$HOME/builds/clean-mozilla-central/mozilla/"
+fi
 
 cd "$(dirname "$0")"
 
 if [ "$(git status -s . | wc -l)" != "0" ]
 then
     echo "Directory not clean" 1>&2
     exit 1
 fi
 
+if [ -e "$MOZTREE/.git" ]
+then
+  MOZREV="$(cd "$MOZTREE" && git cinnabar git2hg HEAD)"
+else
+  MOZREV="$(cd "$MOZTREE" && hg par --temp='{node}')"
+fi
+
 rsync -avz --delete --filter=". ./sync-tests-filter" "$MOZTREE"/layout/reftests/w3c-css/submitted/ ./
 sed -i -e 's/^\(\(fails\|needs-focus\|random\|skip\|asserts\|slow\|require-or\|silentfail\|pref\|test-pref\|ref-pref\|fuzzy\)[^ ]* *\?\)\+//;/^default-preferences /d;s/ \?# \?\(TC: \)\?[bB]ug.*//;s/ # Initial mulet triage:.*//' $(find . -name reftest.list)
 sed -i -e 's/-moz-column/column/g;s/-moz-crisp-edges/pixelated/g' $(find . -regex ".*\.\(xht\|xhtml\|html\|css\)")
 git add -A .
-git commit -m"Sync Mozilla tests as of https://hg.mozilla.org/mozilla-central/rev/$(cd "$MOZTREE" && hg par --temp='{node}') ." .
+git commit -m"Sync Mozilla tests as of https://hg.mozilla.org/mozilla-central/rev/$MOZREV ." .