Chromium Code Reviews| Index: third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/checkout.sh |
| diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/checkout.sh b/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/checkout.sh |
| index 620940d7f125f34e2592e3ca300ad35b32df3660..5b612353e79318e8ec0c77e289d5523e90a97d4e 100755 |
| --- a/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/checkout.sh |
| +++ b/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/checkout.sh |
| @@ -20,6 +20,7 @@ function clone { |
| # Clone the main repository. |
| git clone $REMOTE_REPO $TARGET_DIR |
| cd $TARGET_DIR && git checkout $WPT_HEAD |
| + echo "WPTHead: " `git rev-parse HEAD` |
| # Starting from the 2nd line of WPTWhiteList, we read and checkout submodules. |
| tail -n+2 $DIR/WPTHeads | while read dir submodule commit; do |
| @@ -27,12 +28,16 @@ function clone { |
| git submodule update --init $submodule && \ |
| cd $TARGET_DIR/$dir/$submodule && \ |
| git checkout $commit |
| + echo "WPTHead: $dir $submodule" `git rev-parse HEAD` |
| done |
| } |
| function reduce { |
| - # Remove all except white-listed. |
| cd $TARGET_DIR |
| + # web-platform-tests/html/ contains a filename with ', and it confuses |
| + # xargs on macOS. |
|
jsbell
2016/11/03 16:19:40
This is unfortunate... how about using -print0, --
|
| + rm -fr html |
| + # Remove all except white-listed. |
| find . -type f | grep -Fxvf ../WPTWhiteList | xargs -n 1 rm |
| find . -empty -type d -delete |
| } |