Update web-platform-tests to revision 8a2ceb5f18911302b7a5c1cd2791f4ab50ad4326

tests/wpt/web-platform-tests/css/build-css-testsuites.sh

@@ -1,49 +1,57 @@
 #!/usr/bin/env sh
 set -ex
 
-cd "`dirname $0`"
+SCRIPT_DIR=$(dirname $(readlink -f "$0"))
+WPT_ROOT=$(readlink -f $SCRIPT_DIR/../..)
+cd $WPT_ROOT
 
-if [ -z $VENV ]; then
-    VENV=tools/_virtualenv
-fi
+main() {
+    cd css
 
-# Create the virtualenv
-if [ ! -d $VENV ]; then
-    if [ -z $PYTHON ]; then
-        command -v python
-        if [ $? -eq 0 ]; then
-            if [ `python -c 'import sys; print(sys.version[0:3])'` == "2.7" ]; then
-                PYTHON=python
+    if [ -z $VENV ]; then
+        VENV=tools/_virtualenv
+    fi
+
+    # Create the virtualenv
+    if [ ! -d $VENV ]; then
+        if [ -z $PYTHON ]; then
+            command -v python
+            if [ $? -eq 0 ]; then
+                if [ `python -c 'import sys; print(sys.version[0:3])'` == "2.7" ]; then
+                    PYTHON=python
+                fi
             fi
         fi
-    fi
 
-    if [ -z $PYTHON ]; then
-        command -v python2
-        if [ $? -eq 0 ]; then
-            PYTHON=python2
+        if [ -z $PYTHON ]; then
+            command -v python2
+            if [ $? -eq 0 ]; then
+                PYTHON=python2
+            fi
         fi
+
+        if [ -z $PYTHON ]; then
+            echo "Please ensure Python 2.7 is installed"
+            exit 1
+        fi
+
+        virtualenv -p $PYTHON $VENV || { echo "Please ensure virtualenv is installed"; exit 2; }
     fi
 
-    if [ -z $PYTHON ]; then
-        echo "Please ensure Python 2.7 is installed"
-        exit 1
+    # Install dependencies
+    $VENV/bin/pip install -r requirements.txt
+
+    # Fetch hg submodules if they're not there
+    if [ ! -d tools/apiclient ]; then
+        $VENV/bin/hg clone https://hg.csswg.org/dev/apiclient tools/apiclient
     fi
 
-    virtualenv -p $PYTHON $VENV || { echo "Please ensure virtualenv is installed"; exit 2; }
-fi
+    if [ ! -d tools/w3ctestlib ]; then
+        $VENV/bin/hg clone https://hg.csswg.org/dev/w3ctestlib tools/w3ctestlib
+    fi
 
-# Install dependencies
-$VENV/bin/pip install -r requirements.txt
+    # Run the build script
+    $VENV/bin/python tools/build.py "$@"
+}
 
-# Fetch hg submodules if they're not there
-if [ ! -d tools/apiclient ]; then
-    $VENV/bin/hg clone https://hg.csswg.org/dev/apiclient tools/apiclient
-fi
-
-if [ ! -d tools/w3ctestlib ]; then
-    $VENV/bin/hg clone https://hg.csswg.org/dev/w3ctestlib tools/w3ctestlib
-fi
-
-# Run the build script
-$VENV/bin/python tools/build.py "$@"
+main