[RES2] Move pymake to python/ and remove a bunch of mozconfig and other half-out-of-date MozInfra items from build/

192 files changed, 1 insertions, 279 deletions

diff --git a/build/mozconfig.automation b/build/mozconfig.automation
deleted file mode 100644
index 057a4a0b5..000000000
--- a/build/mozconfig.automation
+++ /dev/null
@@ -1,33 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# Common mozconfig for automation builds.
-#
-# We export MOZ_AUTOMATION_* variables here to trigger various steps in
-# automation builds.  For example, if MOZ_AUTOMATION_PACKAGE is set, then the
-# package step will run.  This file contains the default settings, which can be
-# overridden by setting them earlier in the appropriate mozconfig.
-
-mk_add_options "export MOZ_AUTOMATION_BUILD_SYMBOLS=${MOZ_AUTOMATION_BUILD_SYMBOLS-1}"
-mk_add_options "export MOZ_AUTOMATION_L10N_CHECK=${MOZ_AUTOMATION_L10N_CHECK-1}"
-mk_add_options "export MOZ_AUTOMATION_PACKAGE=${MOZ_AUTOMATION_PACKAGE-1}"
-mk_add_options "export MOZ_AUTOMATION_PACKAGE_TESTS=${MOZ_AUTOMATION_PACKAGE_TESTS-1}"
-mk_add_options "export MOZ_AUTOMATION_INSTALLER=${MOZ_AUTOMATION_INSTALLER-0}"
-mk_add_options "export MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-0}"
-mk_add_options "export MOZ_AUTOMATION_UPLOAD=${MOZ_AUTOMATION_UPLOAD-1}"
-mk_add_options "export MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-0}"
-mk_add_options "export MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-0}"
-
-# If we are also building with MOZ_PKG_PRETTYNAMES, set the corresponding
-# stages.
-if test "$MOZ_AUTOMATION_PRETTY" = "1"; then
-    mk_add_options "export MOZ_AUTOMATION_PRETTY_PACKAGE=${MOZ_AUTOMATION_PACKAGE-1}"
-    mk_add_options "export MOZ_AUTOMATION_PRETTY_PACKAGE_TESTS=${MOZ_AUTOMATION_PACKAGE_TESTS-1}"
-    mk_add_options "export MOZ_AUTOMATION_PRETTY_L10N_CHECK=${MOZ_AUTOMATION_L10N_CHECK-1}"
-    mk_add_options "export MOZ_AUTOMATION_PRETTY_INSTALLER=${MOZ_AUTOMATION_INSTALLER-0}"
-
-    # Note that we always build the update packaging with pretty names even if
-    # we don't build it without, so this is set to 1.
-    mk_add_options "export MOZ_AUTOMATION_PRETTY_UPDATE_PACKAGING=1"
-fi
diff --git a/build/mozconfig.cache b/build/mozconfig.cache
deleted file mode 100644
index be740e293..000000000
--- a/build/mozconfig.cache
+++ /dev/null
@@ -1,135 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# Setup for build cache
-
-# Avoid duplication if the file happens to be included twice.
-if test -z "$bucket" -a -z "$NO_CACHE"; then
-
-# buildbot (or builders that use buildprops.json):
-if [ -f $topsrcdir/../buildprops.json ]; then
-read branch platform master <<EOF
-$(python2.7 -c 'import json; p = json.loads(open("'"$topsrcdir"'/../buildprops.json").read())["properties"]; print p["branch"], p["platform"], p["master"]' 2> /dev/null)
-EOF
-
-bucket=
-if test -z "$SCCACHE_DISABLE" -a -z "$no_sccache" -a -z "$MOZ_PGO_IS_SET" -a -z "$MOZ_PGO"; then
-    case "${branch}" in
-    try)
-        case "${master}" in
-        *scl1.mozilla.com*|*.scl3.mozilla.com*)
-            bucket=mozilla-releng-s3-cache-us-west-1-try
-            ;;
-        *use1.mozilla.com*)
-            bucket=mozilla-releng-s3-cache-us-east-1-try
-            ;;
-        *usw2.mozilla.com*)
-            bucket=mozilla-releng-s3-cache-us-west-2-try
-            ;;
-        esac
-        ;;
-    autoland|mozilla-inbound)
-        case "${master}" in
-        *use1.mozilla.com*)
-            bucket=mozilla-releng-s3-cache-us-east-1-prod
-            ;;
-        *usw2.mozilla.com*)
-            bucket=mozilla-releng-s3-cache-us-west-2-prod
-            ;;
-        esac
-        ;;
-    esac
-fi
-
-# builds without buildprops (eg: taskcluster or non-buildbot) and without ccache env config and without sccache disabled:
-elif test -z "$CCACHE_DIR" -a -z "$SCCACHE_DISABLE" -a -z "$no_sccache" -a -z "$MOZ_PGO_IS_SET" -a -z "$MOZ_PGO"; then
-
-    # prevent rerun if az is set, or wget is not available
-    if test -z "$availability_zone" -a -x "$(command -v wget)"; then
-        # timeout after 1 second, and don't retry (failure indicates instance is not in ec2 or network issue)
-        # availability_zone is of the form <region><letter> where region is e.g. us-west-2, and az is us-west-2a
-        availability_zone=$(wget -T 1 -t 1 -q -O - http://169.254.169.254/latest/meta-data/placement/availability-zone || true)
-        if test -z "$availability_zone" -o "$availability_zone" = "not-ec2"; then
-            availability_zone=not-ec2
-        else
-            # region is az with last letter trimmed
-            region=${availability_zone%?}
-            # set S3 bucket according to tree (level)
-            case "${GECKO_HEAD_REPOSITORY}" in
-            *hg.mozilla.org/try*)
-                bucket=taskcluster-level-1-sccache-${region}
-                ;;
-            *hg.mozilla.org/integration/autoland*|*hg.mozilla.org/integration/mozilla-inbound*)
-                bucket=taskcluster-level-3-sccache-${region}
-                ;;
-            esac
-
-            # set a dummy master
-            case "${region}" in
-            eu-central-1)
-                master=dummy.euc1.mozilla.com
-                ;;
-            us-east-1)
-                master=dummy.use1.mozilla.com
-                ;;
-            us-west-1)
-                master=dummy.usw1.mozilla.com
-                ;;
-            us-west-2)
-                master=dummy.usw2.mozilla.com
-                ;;
-            esac
-        fi
-    fi
-fi
-
-# if platform hasn't been determined from buildprops, and we're on windows,
-# it must be set to prevent adding ac_add_options --with-ccache below
-if test -z "$platform"; then
-    # set platform based on the SYSTEMROOT env var
-    case "${SYSTEMROOT}" in
-    *Windows)
-        platform=windows
-        ;;
-    esac
-fi
-
-if test -z "$bucket"; then
-    case "$platform" in
-    win*) : ;;
-    *)
-        ac_add_options --with-ccache
-    esac
-else
-    if ! test -e $topsrcdir/sccache/sccache.py; then
-        echo "Sccache missing in the tooltool manifest" >&2
-        exit 1
-    fi
-    mk_add_options "export SCCACHE_BUCKET=$bucket"
-    case "$master" in
-    *us[ew][12].mozilla.com*|*euc1.mozilla.com*)
-        mk_add_options "export SCCACHE_NAMESERVER=169.254.169.253"
-        ;;
-    esac
-    ac_add_options "--with-compiler-wrapper=python2.7 $topsrcdir/sccache/sccache.py"
-    mk_add_options MOZ_PREFLIGHT_ALL+=build/sccache.mk
-    mk_add_options MOZ_POSTFLIGHT_ALL+=build/sccache.mk
-    mk_add_options "UPLOAD_EXTRA_FILES+=sccache.log.gz"
-    case "$platform" in
-    win*)
-        # sccache supports a special flag to create depfiles.
-        export _DEPEND_CFLAGS='-deps$(MDDEPDIR)/$(@F).pp'
-        # Windows builds have a default wrapper that needs to be overridden
-        mk_add_options "export CC_WRAPPER="
-        mk_add_options "export CXX_WRAPPER="
-        # For now, sccache doesn't support separate PDBs so force debug info to be
-        # in object files.
-        mk_add_options "export COMPILE_PDB_FLAG="
-        mk_add_options "export HOST_PDB_FLAG="
-        mk_add_options "export MOZ_DEBUG_FLAGS=-Z7"
-        ;;
-    esac
-fi
-
-fi
diff --git a/build/mozconfig.clang-cl b/build/mozconfig.clang-cl
deleted file mode 100644
index 5fa1007bd..000000000
--- a/build/mozconfig.clang-cl
+++ /dev/null
@@ -1,7 +0,0 @@
-CLANG_DIR=`cd "$topsrcdir/clang/bin" ; pwd`
-export PATH="${CLANG_DIR}:${PATH}"
-
-mk_export_correct_style PATH
-
-export CC=clang-cl
-export CXX=clang-cl
diff --git a/build/mozconfig.common b/build/mozconfig.common
deleted file mode 100644
index 1bdf69ddc..000000000
--- a/build/mozconfig.common
+++ /dev/null
@@ -1,21 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# Common mozconfig for official builds.
-#
-# Add options to this file that will be inherited by all in-tree mozconfigs.
-# This is useful for eg try builds with nondefault options that apply to all
-# architectures, though note that if you want to override options set in
-# another mozconfig file, you'll need to use mozconfig.common.override instead
-# of this file.
-
-mk_add_options AUTOCLOBBER=1
-
-ac_add_options --enable-crashreporter
-
-ac_add_options --enable-release
-
-ac_add_options --enable-js-shell
-
-. "$topsrcdir/build/mozconfig.automation"
diff --git a/build/mozconfig.common.override b/build/mozconfig.common.override
deleted file mode 100644
index 7285aa9dd..000000000
--- a/build/mozconfig.common.override
+++ /dev/null
@@ -1,11 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# Common mozconfig for all users
-#
-# Add options to this file that will be inherited by all in-tree mozconfigs.
-# This file is included at the *end* of the mozconfigs, and so may be used
-# to override anything done previously.
-#
-# The common expected usage is for try builds with nondefault options.
diff --git a/build/mozconfig.vs-common b/build/mozconfig.vs-common
deleted file mode 100644
index ca5df2f3a..000000000
--- a/build/mozconfig.vs-common
+++ /dev/null
@@ -1,4 +0,0 @@
-# Pymake needs Windows-style paths. Use cmd.exe to hack around this.

-mk_export_correct_style() {

-  mk_add_options "export $1=$(cmd.exe //c echo %$1%)"

-}

diff --git a/build/mozconfig.win-common b/build/mozconfig.win-common
deleted file mode 100644
index 6e25b7ce4..000000000
--- a/build/mozconfig.win-common
+++ /dev/null
@@ -1,16 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-if [ "x$IS_NIGHTLY" = "xyes" ]; then
-  # Some nightlies (eg: Mulet) don't want these set.
-  MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
-  MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-1}
-  MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
-fi
-
-# Some builds (eg: Mulet) don't want the installer, so only set this if it
-# hasn't already been set.
-MOZ_AUTOMATION_INSTALLER=${MOZ_AUTOMATION_INSTALLER-1}
-
-export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=c:/builds/crash-stats-api.token
diff --git a/build/virtualenv_packages.txt b/build/virtualenv_packages.txt
index 047aa4a29..b8e0ecd84 100644
--- a/build/virtualenv_packages.txt
+++ b/build/virtualenv_packages.txt
@@ -9,7 +9,7 @@ mach.pth:python/mach
 mozbuild.pth:python/mozbuild
 mozversioncontrol.pth:python/mozversioncontrol
 mozlint.pth:python/mozlint
-pymake.pth:build/pymake
+pymake.pth:python/pymake
 optional:setup.py:python/psutil:build_ext:--inplace
 optional:psutil.pth:python/psutil
 which.pth:python/which
diff --git a/build/win32/mozconfig.vs-latest b/build/win32/mozconfig.vs-latest
deleted file mode 100644
index 9c8726a8d..000000000
--- a/build/win32/mozconfig.vs-latest
+++ /dev/null
@@ -1 +0,0 @@
-. $topsrcdir/build/win32/mozconfig.vs2015-win64
diff --git a/build/win32/mozconfig.vs2015-win64 b/build/win32/mozconfig.vs2015-win64
deleted file mode 100644
index b81afa681..000000000
--- a/build/win32/mozconfig.vs2015-win64
+++ /dev/null
@@ -1,25 +0,0 @@
-if [ -z "${VSPATH}" ]; then
-    TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
-    VSPATH="$(cd ${TOOLTOOL_DIR} && pwd)/vs2015u3"
-fi
-
-VSWINPATH="$(cd ${VSPATH} && pwd -W)"
-
-export WINDOWSSDKDIR="${VSWINPATH}/SDK"
-export WIN32_REDIST_DIR="${VSPATH}/VC/redist/x86/Microsoft.VC140.CRT"
-export WIN_UCRT_REDIST_DIR="${VSPATH}/SDK/Redist/ucrt/DLLs/x86"
-
-export PATH="${VSPATH}/VC/bin/amd64_x86:${VSPATH}/VC/bin/amd64:${VSPATH}/VC/bin:${VSPATH}/SDK/bin/x86:${VSPATH}/SDK/bin/x64:${VSPATH}/DIA SDK/bin:${PATH}"
-export PATH="${VSPATH}/VC/redist/x86/Microsoft.VC140.CRT:${VSPATH}/VC/redist/x64/Microsoft.VC140.CRT:${VSPATH}/SDK/Redist/ucrt/DLLs/x86:${VSPATH}/SDK/Redist/ucrt/DLLs/x64:${PATH}"
-
-export INCLUDE="${VSPATH}/VC/include:${VSPATH}/VC/atlmfc/include:${VSPATH}/SDK/Include/10.0.14393.0/ucrt:${VSPATH}/SDK/Include/10.0.14393.0/shared:${VSPATH}/SDK/Include/10.0.14393.0/um:${VSPATH}/SDK/Include/10.0.14393.0/winrt:${VSPATH}/DIA SDK/include"
-export LIB="${VSPATH}/VC/lib:${VSPATH}/VC/atlmfc/lib:${VSPATH}/SDK/lib/10.0.14393.0/ucrt/x86:${VSPATH}/SDK/lib/10.0.14393.0/um/x86:${VSPATH}/DIA SDK/lib"
-
-. $topsrcdir/build/mozconfig.vs-common
-
-mk_export_correct_style WINDOWSSDKDIR
-mk_export_correct_style INCLUDE
-mk_export_correct_style LIB
-mk_export_correct_style PATH
-mk_export_correct_style WIN32_REDIST_DIR
-mk_export_correct_style WIN_UCRT_REDIST_DIR
diff --git a/build/win64/mozconfig.vs-latest b/build/win64/mozconfig.vs-latest
deleted file mode 100644
index 3470d4ace..000000000
--- a/build/win64/mozconfig.vs-latest
+++ /dev/null
@@ -1 +0,0 @@
-. $topsrcdir/build/win64/mozconfig.vs2015
diff --git a/build/win64/mozconfig.vs2015 b/build/win64/mozconfig.vs2015
deleted file mode 100644
index e81a00064..000000000
--- a/build/win64/mozconfig.vs2015
+++ /dev/null
@@ -1,24 +0,0 @@
-if [ -z "${VSPATH}" ]; then
-    TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
-    VSPATH="$(cd ${TOOLTOOL_DIR} && pwd)/vs2015u3"
-fi
-
-VSWINPATH="$(cd ${VSPATH} && pwd -W)"
-
-export WINDOWSSDKDIR="${VSWINPATH}/SDK"
-export WIN32_REDIST_DIR=${VSPATH}/VC/redist/x64/Microsoft.VC140.CRT
-export WIN_UCRT_REDIST_DIR="${VSPATH}/SDK/Redist/ucrt/DLLs/x64"
-
-export PATH="${VSPATH}/VC/bin/amd64:${VSPATH}/VC/bin:${VSPATH}/SDK/bin/x64:${VSPATH}/VC/redist/x64/Microsoft.VC140.CRT:${VSPATH}/SDK/Redist/ucrt/DLLs/x64:${VSPATH}/DIA SDK/bin/amd64:${PATH}"
-
-export INCLUDE="${VSPATH}/VC/include:${VSPATH}/VC/atlmfc/include:${VSPATH}/SDK/Include/10.0.14393.0/ucrt:${VSPATH}/SDK/Include/10.0.14393.0/shared:${VSPATH}/SDK/Include/10.0.14393.0/um:${VSPATH}/SDK/Include/10.0.14393.0/winrt:${VSPATH}/DIA SDK/include"
-export LIB="${VSPATH}/VC/lib/amd64:${VSPATH}/VC/atlmfc/lib/amd64:${VSPATH}/SDK/lib/10.0.14393.0/ucrt/x64:${VSPATH}/SDK/lib/10.0.14393.0/um/x64:${VSPATH}/DIA SDK/lib/amd64"
-
-. $topsrcdir/build/mozconfig.vs-common
-
-mk_export_correct_style WINDOWSSDKDIR
-mk_export_correct_style INCLUDE
-mk_export_correct_style LIB
-mk_export_correct_style PATH
-mk_export_correct_style WIN32_REDIST_DIR
-mk_export_correct_style WIN_UCRT_REDIST_DIR
diff --git a/build/pymake/LICENSE b/python/pymake/LICENSE
index 04a7d641d..04a7d641d 100644
--- a/build/pymake/LICENSE
+++ b/python/pymake/LICENSE
diff --git a/build/pymake/README b/python/pymake/README
index 4f0fdfea4..4f0fdfea4 100644
--- a/build/pymake/README
+++ b/python/pymake/README
diff --git a/build/pymake/make.py b/python/pymake/make.py
index 0857f3f8c..0857f3f8c 100755..100644
--- a/build/pymake/make.py
+++ b/python/pymake/make.py
diff --git a/build/pymake/mkformat.py b/python/pymake/mkformat.py
index 41dd761b2..41dd761b2 100755..100644
--- a/build/pymake/mkformat.py
+++ b/python/pymake/mkformat.py
diff --git a/build/pymake/mkparse.py b/python/pymake/mkparse.py
index 253683948..253683948 100755..100644
--- a/build/pymake/mkparse.py
+++ b/python/pymake/mkparse.py
diff --git a/build/pymake/pymake/__init__.py b/python/pymake/pymake/__init__.py
index e69de29bb..e69de29bb 100644
--- a/build/pymake/pymake/__init__.py
+++ b/python/pymake/pymake/__init__.py
diff --git a/build/pymake/pymake/builtins.py b/python/pymake/pymake/builtins.py
index eb6f2e11b..eb6f2e11b 100644
--- a/build/pymake/pymake/builtins.py
+++ b/python/pymake/pymake/builtins.py
diff --git a/build/pymake/pymake/command.py b/python/pymake/pymake/command.py
index cd68e4fdb..cd68e4fdb 100644
--- a/build/pymake/pymake/command.py
+++ b/python/pymake/pymake/command.py
diff --git a/build/pymake/pymake/data.py b/python/pymake/pymake/data.py
index dcd7e9225..dcd7e9225 100644
--- a/build/pymake/pymake/data.py
+++ b/python/pymake/pymake/data.py
diff --git a/build/pymake/pymake/functions.py b/python/pymake/pymake/functions.py
index e53fb5472..e53fb5472 100644
--- a/build/pymake/pymake/functions.py
+++ b/python/pymake/pymake/functions.py
diff --git a/build/pymake/pymake/globrelative.py b/python/pymake/pymake/globrelative.py
index 37ca28e06..37ca28e06 100644
--- a/build/pymake/pymake/globrelative.py
+++ b/python/pymake/pymake/globrelative.py
diff --git a/build/pymake/pymake/implicit.py b/python/pymake/pymake/implicit.py
index d73895cab..d73895cab 100644
--- a/build/pymake/pymake/implicit.py
+++ b/python/pymake/pymake/implicit.py
diff --git a/build/pymake/pymake/parser.py b/python/pymake/pymake/parser.py
index 4bff53368..4bff53368 100644
--- a/build/pymake/pymake/parser.py
+++ b/python/pymake/pymake/parser.py
diff --git a/build/pymake/pymake/parserdata.py b/python/pymake/pymake/parserdata.py
index 7b2e5443d..7b2e5443d 100644
--- a/build/pymake/pymake/parserdata.py
+++ b/python/pymake/pymake/parserdata.py
diff --git a/build/pymake/pymake/process.py b/python/pymake/pymake/process.py
index 01cadf5a9..01cadf5a9 100644
--- a/build/pymake/pymake/process.py
+++ b/python/pymake/pymake/process.py
diff --git a/build/pymake/pymake/util.py b/python/pymake/pymake/util.py
index c63f930cc..c63f930cc 100644
--- a/build/pymake/pymake/util.py
+++ b/python/pymake/pymake/util.py
diff --git a/build/pymake/pymake/win32process.py b/python/pymake/pymake/win32process.py
index 880a26a5b..880a26a5b 100644
--- a/build/pymake/pymake/win32process.py
+++ b/python/pymake/pymake/win32process.py
diff --git a/build/pymake/tests/automatic-variables.mk b/python/pymake/tests/automatic-variables.mk
index 5302c08ea..5302c08ea 100644
--- a/build/pymake/tests/automatic-variables.mk
+++ b/python/pymake/tests/automatic-variables.mk
diff --git a/build/pymake/tests/bad-command-continuation.mk b/python/pymake/tests/bad-command-continuation.mk
index d9ceccfc2..d9ceccfc2 100644
--- a/build/pymake/tests/bad-command-continuation.mk
+++ b/python/pymake/tests/bad-command-continuation.mk
diff --git a/build/pymake/tests/call.mk b/python/pymake/tests/call.mk
index 9eeb7e00c..9eeb7e00c 100644
--- a/build/pymake/tests/call.mk
+++ b/python/pymake/tests/call.mk
diff --git a/build/pymake/tests/cmd-stripdotslash.mk b/python/pymake/tests/cmd-stripdotslash.mk
index ce5ed4244..ce5ed4244 100644
--- a/build/pymake/tests/cmd-stripdotslash.mk
+++ b/python/pymake/tests/cmd-stripdotslash.mk
diff --git a/build/pymake/tests/cmdgoals.mk b/python/pymake/tests/cmdgoals.mk
index a3b25e751..a3b25e751 100644
--- a/build/pymake/tests/cmdgoals.mk
+++ b/python/pymake/tests/cmdgoals.mk
diff --git a/build/pymake/tests/commandmodifiers.mk b/python/pymake/tests/commandmodifiers.mk
index 8440462f3..8440462f3 100644
--- a/build/pymake/tests/commandmodifiers.mk
+++ b/python/pymake/tests/commandmodifiers.mk
diff --git a/build/pymake/tests/comment-parsing.mk b/python/pymake/tests/comment-parsing.mk
index d469e1aea..d469e1aea 100644
--- a/build/pymake/tests/comment-parsing.mk
+++ b/python/pymake/tests/comment-parsing.mk
diff --git a/build/pymake/tests/continuations-in-functions.mk b/python/pymake/tests/continuations-in-functions.mk
index 533df6176..533df6176 100644
--- a/build/pymake/tests/continuations-in-functions.mk
+++ b/python/pymake/tests/continuations-in-functions.mk
diff --git a/build/pymake/tests/datatests.py b/python/pymake/tests/datatests.py
index 513028b0b..513028b0b 100644
--- a/build/pymake/tests/datatests.py
+++ b/python/pymake/tests/datatests.py
diff --git a/build/pymake/tests/default-goal-set-first.mk b/python/pymake/tests/default-goal-set-first.mk
index 00a5b53a2..00a5b53a2 100644
--- a/build/pymake/tests/default-goal-set-first.mk
+++ b/python/pymake/tests/default-goal-set-first.mk
diff --git a/build/pymake/tests/default-goal.mk b/python/pymake/tests/default-goal.mk
index 699d6c0cd..699d6c0cd 100644
--- a/build/pymake/tests/default-goal.mk
+++ b/python/pymake/tests/default-goal.mk
diff --git a/build/pymake/tests/default-target.mk b/python/pymake/tests/default-target.mk
index 701ac6916..701ac6916 100644
--- a/build/pymake/tests/default-target.mk
+++ b/python/pymake/tests/default-target.mk
diff --git a/build/pymake/tests/default-target2.mk b/python/pymake/tests/default-target2.mk
index b5a4b1bbf..b5a4b1bbf 100644
--- a/build/pymake/tests/default-target2.mk
+++ b/python/pymake/tests/default-target2.mk
diff --git a/build/pymake/tests/define-directive.mk b/python/pymake/tests/define-directive.mk
index 789988666..789988666 100644
--- a/build/pymake/tests/define-directive.mk
+++ b/python/pymake/tests/define-directive.mk
diff --git a/build/pymake/tests/depfailed.mk b/python/pymake/tests/depfailed.mk
index ce4137c38..ce4137c38 100644
--- a/build/pymake/tests/depfailed.mk
+++ b/python/pymake/tests/depfailed.mk
diff --git a/build/pymake/tests/depfailedj.mk b/python/pymake/tests/depfailedj.mk
index a94c74f6f..a94c74f6f 100644
--- a/build/pymake/tests/depfailedj.mk
+++ b/python/pymake/tests/depfailedj.mk
diff --git a/build/pymake/tests/diamond-deps.mk b/python/pymake/tests/diamond-deps.mk
index 40a4176d9..40a4176d9 100644
--- a/build/pymake/tests/diamond-deps.mk
+++ b/python/pymake/tests/diamond-deps.mk
diff --git a/build/pymake/tests/dotslash-dir.mk b/python/pymake/tests/dotslash-dir.mk
index 8b30d1e3c..8b30d1e3c 100644
--- a/build/pymake/tests/dotslash-dir.mk
+++ b/python/pymake/tests/dotslash-dir.mk
diff --git a/build/pymake/tests/dotslash-parse.mk b/python/pymake/tests/dotslash-parse.mk
index 91461bedb..91461bedb 100644
--- a/build/pymake/tests/dotslash-parse.mk
+++ b/python/pymake/tests/dotslash-parse.mk
diff --git a/build/pymake/tests/dotslash-phony.mk b/python/pymake/tests/dotslash-phony.mk
index 06b6ae78d..06b6ae78d 100644
--- a/build/pymake/tests/dotslash-phony.mk
+++ b/python/pymake/tests/dotslash-phony.mk
diff --git a/build/pymake/tests/dotslash.mk b/python/pymake/tests/dotslash.mk
index 585db96b7..585db96b7 100644
--- a/build/pymake/tests/dotslash.mk
+++ b/python/pymake/tests/dotslash.mk
diff --git a/build/pymake/tests/doublecolon-exists.mk b/python/pymake/tests/doublecolon-exists.mk
index 5d99a1f6b..5d99a1f6b 100644
--- a/build/pymake/tests/doublecolon-exists.mk
+++ b/python/pymake/tests/doublecolon-exists.mk
diff --git a/build/pymake/tests/doublecolon-priordeps.mk b/python/pymake/tests/doublecolon-priordeps.mk
index 6cdf3a8e7..6cdf3a8e7 100644
--- a/build/pymake/tests/doublecolon-priordeps.mk
+++ b/python/pymake/tests/doublecolon-priordeps.mk
diff --git a/build/pymake/tests/doublecolon-remake.mk b/python/pymake/tests/doublecolon-remake.mk
index 52aa9265c..52aa9265c 100644
--- a/build/pymake/tests/doublecolon-remake.mk
+++ b/python/pymake/tests/doublecolon-remake.mk
diff --git a/build/pymake/tests/dynamic-var.mk b/python/pymake/tests/dynamic-var.mk
index 0993b9ccf..0993b9ccf 100644
--- a/build/pymake/tests/dynamic-var.mk
+++ b/python/pymake/tests/dynamic-var.mk
diff --git a/build/pymake/tests/empty-arg.mk b/python/pymake/tests/empty-arg.mk
index 616e5b694..616e5b694 100644
--- a/build/pymake/tests/empty-arg.mk
+++ b/python/pymake/tests/empty-arg.mk
diff --git a/build/pymake/tests/empty-command-semicolon.mk b/python/pymake/tests/empty-command-semicolon.mk
index 07789f3f1..07789f3f1 100644
--- a/build/pymake/tests/empty-command-semicolon.mk
+++ b/python/pymake/tests/empty-command-semicolon.mk
diff --git a/build/pymake/tests/empty-with-deps.mk b/python/pymake/tests/empty-with-deps.mk
index 284e5a113..284e5a113 100644
--- a/build/pymake/tests/empty-with-deps.mk
+++ b/python/pymake/tests/empty-with-deps.mk
diff --git a/build/pymake/tests/env-var-append.mk b/python/pymake/tests/env-var-append.mk
index 4db39c45f..4db39c45f 100644
--- a/build/pymake/tests/env-var-append.mk
+++ b/python/pymake/tests/env-var-append.mk
diff --git a/build/pymake/tests/env-var-append2.mk b/python/pymake/tests/env-var-append2.mk
index fc0735d88..fc0735d88 100644
--- a/build/pymake/tests/env-var-append2.mk
+++ b/python/pymake/tests/env-var-append2.mk
diff --git a/build/pymake/tests/eof-continuation.mk b/python/pymake/tests/eof-continuation.mk
index daeaabc3e..daeaabc3e 100644
--- a/build/pymake/tests/eof-continuation.mk
+++ b/python/pymake/tests/eof-continuation.mk
diff --git a/build/pymake/tests/escape-chars.mk b/python/pymake/tests/escape-chars.mk
index ebea33074..ebea33074 100644
--- a/build/pymake/tests/escape-chars.mk
+++ b/python/pymake/tests/escape-chars.mk
diff --git a/build/pymake/tests/escaped-continuation.mk b/python/pymake/tests/escaped-continuation.mk
index 537f7547f..537f7547f 100644
--- a/build/pymake/tests/escaped-continuation.mk
+++ b/python/pymake/tests/escaped-continuation.mk
diff --git a/build/pymake/tests/eval-duringexecute.mk b/python/pymake/tests/eval-duringexecute.mk
index dff848032..dff848032 100644
--- a/build/pymake/tests/eval-duringexecute.mk
+++ b/python/pymake/tests/eval-duringexecute.mk
diff --git a/build/pymake/tests/eval.mk b/python/pymake/tests/eval.mk
index de9759f02..de9759f02 100644
--- a/build/pymake/tests/eval.mk
+++ b/python/pymake/tests/eval.mk
diff --git a/build/pymake/tests/exit-code.mk b/python/pymake/tests/exit-code.mk
index 84dcffcf9..84dcffcf9 100644
--- a/build/pymake/tests/exit-code.mk
+++ b/python/pymake/tests/exit-code.mk
diff --git a/build/pymake/tests/file-functions-symlinks.mk b/python/pymake/tests/file-functions-symlinks.mk
index dcc0f6eef..dcc0f6eef 100644
--- a/build/pymake/tests/file-functions-symlinks.mk
+++ b/python/pymake/tests/file-functions-symlinks.mk
diff --git a/build/pymake/tests/file-functions.mk b/python/pymake/tests/file-functions.mk
index 7e4c68e85..7e4c68e85 100644
--- a/build/pymake/tests/file-functions.mk
+++ b/python/pymake/tests/file-functions.mk
diff --git a/build/pymake/tests/foreach-local-variable.mk b/python/pymake/tests/foreach-local-variable.mk
index 2551621eb..2551621eb 100644
--- a/build/pymake/tests/foreach-local-variable.mk
+++ b/python/pymake/tests/foreach-local-variable.mk
diff --git a/build/pymake/tests/formattingtests.py b/python/pymake/tests/formattingtests.py
index 7aad6d4cc..7aad6d4cc 100644
--- a/build/pymake/tests/formattingtests.py
+++ b/python/pymake/tests/formattingtests.py
diff --git a/build/pymake/tests/func-refs.mk b/python/pymake/tests/func-refs.mk
index 82ab17ba8..82ab17ba8 100644
--- a/build/pymake/tests/func-refs.mk
+++ b/python/pymake/tests/func-refs.mk
diff --git a/build/pymake/tests/functions.mk b/python/pymake/tests/functions.mk
index 817be07aa..817be07aa 100644
--- a/build/pymake/tests/functions.mk
+++ b/python/pymake/tests/functions.mk
diff --git a/build/pymake/tests/functiontests.py b/python/pymake/tests/functiontests.py
index 43a344a05..43a344a05 100644
--- a/build/pymake/tests/functiontests.py
+++ b/python/pymake/tests/functiontests.py
diff --git a/build/pymake/tests/if-syntaxerr.mk b/python/pymake/tests/if-syntaxerr.mk
index c172492ef..c172492ef 100644
--- a/build/pymake/tests/if-syntaxerr.mk
+++ b/python/pymake/tests/if-syntaxerr.mk
diff --git a/build/pymake/tests/ifdefs-nesting.mk b/python/pymake/tests/ifdefs-nesting.mk
index 340530ffa..340530ffa 100644
--- a/build/pymake/tests/ifdefs-nesting.mk
+++ b/python/pymake/tests/ifdefs-nesting.mk
diff --git a/build/pymake/tests/ifdefs.mk b/python/pymake/tests/ifdefs.mk
index a779d197b..a779d197b 100644
--- a/build/pymake/tests/ifdefs.mk
+++ b/python/pymake/tests/ifdefs.mk
diff --git a/build/pymake/tests/ignore-error.mk b/python/pymake/tests/ignore-error.mk
index dc8d3a72c..dc8d3a72c 100644
--- a/build/pymake/tests/ignore-error.mk
+++ b/python/pymake/tests/ignore-error.mk
diff --git a/build/pymake/tests/implicit-chain.mk b/python/pymake/tests/implicit-chain.mk
index 16288b3f5..16288b3f5 100644
--- a/build/pymake/tests/implicit-chain.mk
+++ b/python/pymake/tests/implicit-chain.mk
diff --git a/build/pymake/tests/implicit-dir.mk b/python/pymake/tests/implicit-dir.mk
index c7f75e8d4..c7f75e8d4 100644
--- a/build/pymake/tests/implicit-dir.mk
+++ b/python/pymake/tests/implicit-dir.mk
diff --git a/build/pymake/tests/implicit-terminal.mk b/python/pymake/tests/implicit-terminal.mk
index db2e244ed..db2e244ed 100644
--- a/build/pymake/tests/implicit-terminal.mk
+++ b/python/pymake/tests/implicit-terminal.mk
diff --git a/build/pymake/tests/implicitsubdir.mk b/python/pymake/tests/implicitsubdir.mk
index b9d854a2a..b9d854a2a 100644
--- a/build/pymake/tests/implicitsubdir.mk
+++ b/python/pymake/tests/implicitsubdir.mk
diff --git a/build/pymake/tests/include-dynamic.mk b/python/pymake/tests/include-dynamic.mk
index 571895dc3..571895dc3 100644
--- a/build/pymake/tests/include-dynamic.mk
+++ b/python/pymake/tests/include-dynamic.mk
diff --git a/build/pymake/tests/include-file.inc b/python/pymake/tests/include-file.inc
index d5d495dec..d5d495dec 100644
--- a/build/pymake/tests/include-file.inc
+++ b/python/pymake/tests/include-file.inc
diff --git a/build/pymake/tests/include-missing.mk b/python/pymake/tests/include-missing.mk
index 583d0a065..583d0a065 100644
--- a/build/pymake/tests/include-missing.mk
+++ b/python/pymake/tests/include-missing.mk
diff --git a/build/pymake/tests/include-notfound.mk b/python/pymake/tests/include-notfound.mk
index 1ee7e05b2..1ee7e05b2 100644
--- a/build/pymake/tests/include-notfound.mk
+++ b/python/pymake/tests/include-notfound.mk
diff --git a/build/pymake/tests/include-optional-warning.mk b/python/pymake/tests/include-optional-warning.mk
index 901938dff..901938dff 100644
--- a/build/pymake/tests/include-optional-warning.mk
+++ b/python/pymake/tests/include-optional-warning.mk
diff --git a/build/pymake/tests/include-regen.mk b/python/pymake/tests/include-regen.mk
index c86e0c78d..c86e0c78d 100644
--- a/build/pymake/tests/include-regen.mk
+++ b/python/pymake/tests/include-regen.mk
diff --git a/build/pymake/tests/include-regen2.mk b/python/pymake/tests/include-regen2.mk
index fc7fef073..fc7fef073 100644
--- a/build/pymake/tests/include-regen2.mk
+++ b/python/pymake/tests/include-regen2.mk
diff --git a/build/pymake/tests/include-regen3.mk b/python/pymake/tests/include-regen3.mk
index 878ce0adc..878ce0adc 100644
--- a/build/pymake/tests/include-regen3.mk
+++ b/python/pymake/tests/include-regen3.mk
diff --git a/build/pymake/tests/include-test.mk b/python/pymake/tests/include-test.mk
index 3608fc269..3608fc269 100644
--- a/build/pymake/tests/include-test.mk
+++ b/python/pymake/tests/include-test.mk
diff --git a/build/pymake/tests/includedeps-norebuild.mk b/python/pymake/tests/includedeps-norebuild.mk
index e30abd439..e30abd439 100644
--- a/build/pymake/tests/includedeps-norebuild.mk
+++ b/python/pymake/tests/includedeps-norebuild.mk
diff --git a/build/pymake/tests/includedeps-sideeffects.mk b/python/pymake/tests/includedeps-sideeffects.mk
index 7e4ea30a2..7e4ea30a2 100644
--- a/build/pymake/tests/includedeps-sideeffects.mk
+++ b/python/pymake/tests/includedeps-sideeffects.mk
diff --git a/build/pymake/tests/includedeps-stripdotslash.deps b/python/pymake/tests/includedeps-stripdotslash.deps
index 352fca1bb..352fca1bb 100644
--- a/build/pymake/tests/includedeps-stripdotslash.deps
+++ b/python/pymake/tests/includedeps-stripdotslash.deps
diff --git a/build/pymake/tests/includedeps-stripdotslash.mk b/python/pymake/tests/includedeps-stripdotslash.mk
index ee942e6db..ee942e6db 100644
--- a/build/pymake/tests/includedeps-stripdotslash.mk
+++ b/python/pymake/tests/includedeps-stripdotslash.mk
diff --git a/build/pymake/tests/includedeps-variables.deps b/python/pymake/tests/includedeps-variables.deps
index ba69e9b6c..ba69e9b6c 100644
--- a/build/pymake/tests/includedeps-variables.deps
+++ b/python/pymake/tests/includedeps-variables.deps
diff --git a/build/pymake/tests/includedeps-variables.mk b/python/pymake/tests/includedeps-variables.mk
index 314618da4..314618da4 100644
--- a/build/pymake/tests/includedeps-variables.mk
+++ b/python/pymake/tests/includedeps-variables.mk
diff --git a/build/pymake/tests/includedeps.deps b/python/pymake/tests/includedeps.deps
index d3017c078..d3017c078 100644
--- a/build/pymake/tests/includedeps.deps
+++ b/python/pymake/tests/includedeps.deps
diff --git a/build/pymake/tests/includedeps.mk b/python/pymake/tests/includedeps.mk
index deaa71fe8..deaa71fe8 100644
--- a/build/pymake/tests/includedeps.mk
+++ b/python/pymake/tests/includedeps.mk
diff --git a/build/pymake/tests/info.mk b/python/pymake/tests/info.mk
index 8dddfd815..8dddfd815 100644
--- a/build/pymake/tests/info.mk
+++ b/python/pymake/tests/info.mk
diff --git a/build/pymake/tests/justprint-native.mk b/python/pymake/tests/justprint-native.mk
index 580e402e9..580e402e9 100644
--- a/build/pymake/tests/justprint-native.mk
+++ b/python/pymake/tests/justprint-native.mk
diff --git a/build/pymake/tests/justprint.mk b/python/pymake/tests/justprint.mk
index be11ba8de..be11ba8de 100644
--- a/build/pymake/tests/justprint.mk
+++ b/python/pymake/tests/justprint.mk
diff --git a/build/pymake/tests/keep-going-doublecolon.mk b/python/pymake/tests/keep-going-doublecolon.mk
index fa5b31df8..fa5b31df8 100644
--- a/build/pymake/tests/keep-going-doublecolon.mk
+++ b/python/pymake/tests/keep-going-doublecolon.mk
diff --git a/build/pymake/tests/keep-going-parallel.mk b/python/pymake/tests/keep-going-parallel.mk
index a91d1a6ed..a91d1a6ed 100644
--- a/build/pymake/tests/keep-going-parallel.mk
+++ b/python/pymake/tests/keep-going-parallel.mk
diff --git a/build/pymake/tests/keep-going.mk b/python/pymake/tests/keep-going.mk
index 4c709288c..4c709288c 100644
--- a/build/pymake/tests/keep-going.mk
+++ b/python/pymake/tests/keep-going.mk
diff --git a/build/pymake/tests/line-continuations.mk b/python/pymake/tests/line-continuations.mk
index 8b44480ea..8b44480ea 100644
--- a/build/pymake/tests/line-continuations.mk
+++ b/python/pymake/tests/line-continuations.mk
diff --git a/build/pymake/tests/link-search.mk b/python/pymake/tests/link-search.mk
index ea827f391..ea827f391 100644
--- a/build/pymake/tests/link-search.mk
+++ b/python/pymake/tests/link-search.mk
diff --git a/build/pymake/tests/makeflags.mk b/python/pymake/tests/makeflags.mk
index 288ff7866..288ff7866 100644
--- a/build/pymake/tests/makeflags.mk
+++ b/python/pymake/tests/makeflags.mk
diff --git a/build/pymake/tests/matchany.mk b/python/pymake/tests/matchany.mk
index 7876c90a3..7876c90a3 100644
--- a/build/pymake/tests/matchany.mk
+++ b/python/pymake/tests/matchany.mk
diff --git a/build/pymake/tests/matchany2.mk b/python/pymake/tests/matchany2.mk
index d21d9702c..d21d9702c 100644
--- a/build/pymake/tests/matchany2.mk
+++ b/python/pymake/tests/matchany2.mk
diff --git a/build/pymake/tests/matchany3.mk b/python/pymake/tests/matchany3.mk
index 83de8af2b..83de8af2b 100644
--- a/build/pymake/tests/matchany3.mk
+++ b/python/pymake/tests/matchany3.mk
diff --git a/build/pymake/tests/mkdir-fail.mk b/python/pymake/tests/mkdir-fail.mk
index b05734aa9..b05734aa9 100644
--- a/build/pymake/tests/mkdir-fail.mk
+++ b/python/pymake/tests/mkdir-fail.mk
diff --git a/build/pymake/tests/mkdir.mk b/python/pymake/tests/mkdir.mk
index 413348f77..413348f77 100644
--- a/build/pymake/tests/mkdir.mk
+++ b/python/pymake/tests/mkdir.mk
diff --git a/build/pymake/tests/multiple-rules-prerequisite-merge.mk b/python/pymake/tests/multiple-rules-prerequisite-merge.mk
index 480d3b58c..480d3b58c 100644
--- a/build/pymake/tests/multiple-rules-prerequisite-merge.mk
+++ b/python/pymake/tests/multiple-rules-prerequisite-merge.mk
diff --git a/build/pymake/tests/native-command-delay-load.mk b/python/pymake/tests/native-command-delay-load.mk
index a9f3774eb..a9f3774eb 100644
--- a/build/pymake/tests/native-command-delay-load.mk
+++ b/python/pymake/tests/native-command-delay-load.mk
diff --git a/build/pymake/tests/native-command-raise.mk b/python/pymake/tests/native-command-raise.mk
index d1b28b331..d1b28b331 100644
--- a/build/pymake/tests/native-command-raise.mk
+++ b/python/pymake/tests/native-command-raise.mk
diff --git a/build/pymake/tests/native-command-return-fail1.mk b/python/pymake/tests/native-command-return-fail1.mk
index 0cf085ae2..0cf085ae2 100644
--- a/build/pymake/tests/native-command-return-fail1.mk
+++ b/python/pymake/tests/native-command-return-fail1.mk
diff --git a/build/pymake/tests/native-command-return-fail2.mk b/python/pymake/tests/native-command-return-fail2.mk
index c071fc879..c071fc879 100644
--- a/build/pymake/tests/native-command-return-fail2.mk
+++ b/python/pymake/tests/native-command-return-fail2.mk
diff --git a/build/pymake/tests/native-command-return.mk b/python/pymake/tests/native-command-return.mk
index 3e4d2e0c4..3e4d2e0c4 100644
--- a/build/pymake/tests/native-command-return.mk
+++ b/python/pymake/tests/native-command-return.mk
diff --git a/build/pymake/tests/native-command-shell-glob.mk b/python/pymake/tests/native-command-shell-glob.mk
index 4bcdad8b9..4bcdad8b9 100644
--- a/build/pymake/tests/native-command-shell-glob.mk
+++ b/python/pymake/tests/native-command-shell-glob.mk
diff --git a/build/pymake/tests/native-command-sys-exit-fail1.mk b/python/pymake/tests/native-command-sys-exit-fail1.mk
index 8e74800ed..8e74800ed 100644
--- a/build/pymake/tests/native-command-sys-exit-fail1.mk
+++ b/python/pymake/tests/native-command-sys-exit-fail1.mk
diff --git a/build/pymake/tests/native-command-sys-exit-fail2.mk b/python/pymake/tests/native-command-sys-exit-fail2.mk
index 0a04395ad..0a04395ad 100644
--- a/build/pymake/tests/native-command-sys-exit-fail2.mk
+++ b/python/pymake/tests/native-command-sys-exit-fail2.mk
diff --git a/build/pymake/tests/native-command-sys-exit.mk b/python/pymake/tests/native-command-sys-exit.mk
index c04913aca..c04913aca 100644
--- a/build/pymake/tests/native-command-sys-exit.mk
+++ b/python/pymake/tests/native-command-sys-exit.mk
diff --git a/build/pymake/tests/native-environment.mk b/python/pymake/tests/native-environment.mk
index 36bd5894a..36bd5894a 100644
--- a/build/pymake/tests/native-environment.mk
+++ b/python/pymake/tests/native-environment.mk
diff --git a/build/pymake/tests/native-pycommandpath-sep.mk b/python/pymake/tests/native-pycommandpath-sep.mk
index b1c2c2b97..b1c2c2b97 100644
--- a/build/pymake/tests/native-pycommandpath-sep.mk
+++ b/python/pymake/tests/native-pycommandpath-sep.mk
diff --git a/build/pymake/tests/native-pycommandpath.mk b/python/pymake/tests/native-pycommandpath.mk
index dd0fbc9f9..dd0fbc9f9 100644
--- a/build/pymake/tests/native-pycommandpath.mk
+++ b/python/pymake/tests/native-pycommandpath.mk
diff --git a/build/pymake/tests/native-simple.mk b/python/pymake/tests/native-simple.mk
index 626a58670..626a58670 100644
--- a/build/pymake/tests/native-simple.mk
+++ b/python/pymake/tests/native-simple.mk
diff --git a/build/pymake/tests/native-touch.mk b/python/pymake/tests/native-touch.mk
index 811161ece..811161ece 100644
--- a/build/pymake/tests/native-touch.mk
+++ b/python/pymake/tests/native-touch.mk
diff --git a/build/pymake/tests/newlines.mk b/python/pymake/tests/newlines.mk
index 5d8195c94..5d8195c94 100644
--- a/build/pymake/tests/newlines.mk
+++ b/python/pymake/tests/newlines.mk
diff --git a/build/pymake/tests/no-remake.mk b/python/pymake/tests/no-remake.mk
index c8df81bc3..c8df81bc3 100644
--- a/build/pymake/tests/no-remake.mk
+++ b/python/pymake/tests/no-remake.mk
diff --git a/build/pymake/tests/nosuchfile.mk b/python/pymake/tests/nosuchfile.mk
index cca9ce1e9..cca9ce1e9 100644
--- a/build/pymake/tests/nosuchfile.mk
+++ b/python/pymake/tests/nosuchfile.mk
diff --git a/build/pymake/tests/notargets.mk b/python/pymake/tests/notargets.mk
index 8e55d944f..8e55d944f 100644
--- a/build/pymake/tests/notargets.mk
+++ b/python/pymake/tests/notargets.mk
diff --git a/build/pymake/tests/notparallel.mk b/python/pymake/tests/notparallel.mk
index 4fd8b1a8d..4fd8b1a8d 100644
--- a/build/pymake/tests/notparallel.mk
+++ b/python/pymake/tests/notparallel.mk
diff --git a/build/pymake/tests/oneline-command-continuations.mk b/python/pymake/tests/oneline-command-continuations.mk
index c11f3df52..c11f3df52 100644
--- a/build/pymake/tests/oneline-command-continuations.mk
+++ b/python/pymake/tests/oneline-command-continuations.mk
diff --git a/build/pymake/tests/override-propagate.mk b/python/pymake/tests/override-propagate.mk
index a1663ff41..a1663ff41 100644
--- a/build/pymake/tests/override-propagate.mk
+++ b/python/pymake/tests/override-propagate.mk
diff --git a/build/pymake/tests/parallel-dep-resolution.mk b/python/pymake/tests/parallel-dep-resolution.mk
index 7967eba2d..7967eba2d 100644
--- a/build/pymake/tests/parallel-dep-resolution.mk
+++ b/python/pymake/tests/parallel-dep-resolution.mk
diff --git a/build/pymake/tests/parallel-dep-resolution2.mk b/python/pymake/tests/parallel-dep-resolution2.mk
index 7d61e6b3e..7d61e6b3e 100644
--- a/build/pymake/tests/parallel-dep-resolution2.mk
+++ b/python/pymake/tests/parallel-dep-resolution2.mk
diff --git a/build/pymake/tests/parallel-native.mk b/python/pymake/tests/parallel-native.mk
index d50cfbdbb..d50cfbdbb 100644
--- a/build/pymake/tests/parallel-native.mk
+++ b/python/pymake/tests/parallel-native.mk
diff --git a/build/pymake/tests/parallel-simple.mk b/python/pymake/tests/parallel-simple.mk
index f1aafc5f1..f1aafc5f1 100644
--- a/build/pymake/tests/parallel-simple.mk
+++ b/python/pymake/tests/parallel-simple.mk
diff --git a/build/pymake/tests/parallel-submake.mk b/python/pymake/tests/parallel-submake.mk
index 65cb2cf7c..65cb2cf7c 100644
--- a/build/pymake/tests/parallel-submake.mk
+++ b/python/pymake/tests/parallel-submake.mk
diff --git a/build/pymake/tests/parallel-toserial.mk b/python/pymake/tests/parallel-toserial.mk
index 9a355eb33..9a355eb33 100644
--- a/build/pymake/tests/parallel-toserial.mk
+++ b/python/pymake/tests/parallel-toserial.mk
diff --git a/build/pymake/tests/parallel-waiting.mk b/python/pymake/tests/parallel-waiting.mk
index 40a6e0d50..40a6e0d50 100644
--- a/build/pymake/tests/parallel-waiting.mk
+++ b/python/pymake/tests/parallel-waiting.mk
diff --git a/build/pymake/tests/parentheses.mk b/python/pymake/tests/parentheses.mk
index f207234ff..f207234ff 100644
--- a/build/pymake/tests/parentheses.mk
+++ b/python/pymake/tests/parentheses.mk
diff --git a/build/pymake/tests/parsertests.py b/python/pymake/tests/parsertests.py
index ab6406be0..ab6406be0 100644
--- a/build/pymake/tests/parsertests.py
+++ b/python/pymake/tests/parsertests.py
diff --git a/build/pymake/tests/path-length.mk b/python/pymake/tests/path-length.mk
index 10c33b5ed..10c33b5ed 100644
--- a/build/pymake/tests/path-length.mk
+++ b/python/pymake/tests/path-length.mk
diff --git a/build/pymake/tests/pathdir/pathtest b/python/pymake/tests/pathdir/pathtest
index 17037159f..17037159f 100755..100644
--- a/build/pymake/tests/pathdir/pathtest
+++ b/python/pymake/tests/pathdir/pathtest
diff --git a/build/pymake/tests/pathdir/pathtest.exe b/python/pymake/tests/pathdir/pathtest.exe
index 3178db9a9..3178db9a9 100644
--- a/build/pymake/tests/pathdir/pathtest.exe
+++ b/python/pymake/tests/pathdir/pathtest.exe
diff --git a/build/pymake/tests/pathdir/src/Makefile b/python/pymake/tests/pathdir/src/Makefile
index 6c24bd8f9..6c24bd8f9 100644
--- a/build/pymake/tests/pathdir/src/Makefile
+++ b/python/pymake/tests/pathdir/src/Makefile
diff --git a/build/pymake/tests/pathdir/src/pathtest.cpp b/python/pymake/tests/pathdir/src/pathtest.cpp
index bef8d8a11..bef8d8a11 100644
--- a/build/pymake/tests/pathdir/src/pathtest.cpp
+++ b/python/pymake/tests/pathdir/src/pathtest.cpp
diff --git a/build/pymake/tests/patsubst.mk b/python/pymake/tests/patsubst.mk
index 0c3efdc4b..0c3efdc4b 100644
--- a/build/pymake/tests/patsubst.mk
+++ b/python/pymake/tests/patsubst.mk
diff --git a/build/pymake/tests/phony.mk b/python/pymake/tests/phony.mk
index 36db4d121..36db4d121 100644
--- a/build/pymake/tests/phony.mk
+++ b/python/pymake/tests/phony.mk
diff --git a/build/pymake/tests/pycmd.py b/python/pymake/tests/pycmd.py
index 83b9b966b..83b9b966b 100644
--- a/build/pymake/tests/pycmd.py
+++ b/python/pymake/tests/pycmd.py
diff --git a/build/pymake/tests/recursive-set.mk b/python/pymake/tests/recursive-set.mk
index 853f90463..853f90463 100644
--- a/build/pymake/tests/recursive-set.mk
+++ b/python/pymake/tests/recursive-set.mk
diff --git a/build/pymake/tests/recursive-set2.mk b/python/pymake/tests/recursive-set2.mk
index b68e34f0d..b68e34f0d 100644
--- a/build/pymake/tests/recursive-set2.mk
+++ b/python/pymake/tests/recursive-set2.mk
diff --git a/build/pymake/tests/remake-mtime.mk b/python/pymake/tests/remake-mtime.mk
index 47c775b93..47c775b93 100644
--- a/build/pymake/tests/remake-mtime.mk
+++ b/python/pymake/tests/remake-mtime.mk
diff --git a/build/pymake/tests/rm-fail.mk b/python/pymake/tests/rm-fail.mk
index 1a9aefb57..1a9aefb57 100644
--- a/build/pymake/tests/rm-fail.mk
+++ b/python/pymake/tests/rm-fail.mk
diff --git a/build/pymake/tests/rm.mk b/python/pymake/tests/rm.mk
index 6c7140e39..6c7140e39 100644
--- a/build/pymake/tests/rm.mk
+++ b/python/pymake/tests/rm.mk
diff --git a/build/pymake/tests/runtests.py b/python/pymake/tests/runtests.py
index ab149ecfb..ab149ecfb 100644
--- a/build/pymake/tests/runtests.py
+++ b/python/pymake/tests/runtests.py
diff --git a/build/pymake/tests/serial-dep-resolution.mk b/python/pymake/tests/serial-dep-resolution.mk
index e65f1ed03..e65f1ed03 100644
--- a/build/pymake/tests/serial-dep-resolution.mk
+++ b/python/pymake/tests/serial-dep-resolution.mk
diff --git a/build/pymake/tests/serial-doublecolon-execution.mk b/python/pymake/tests/serial-doublecolon-execution.mk
index 1871cb13a..1871cb13a 100644
--- a/build/pymake/tests/serial-doublecolon-execution.mk
+++ b/python/pymake/tests/serial-doublecolon-execution.mk
diff --git a/build/pymake/tests/serial-rule-execution.mk b/python/pymake/tests/serial-rule-execution.mk
index da5b177de..da5b177de 100644
--- a/build/pymake/tests/serial-rule-execution.mk
+++ b/python/pymake/tests/serial-rule-execution.mk
diff --git a/build/pymake/tests/serial-rule-execution2.mk b/python/pymake/tests/serial-rule-execution2.mk
index 252a7df83..252a7df83 100644
--- a/build/pymake/tests/serial-rule-execution2.mk
+++ b/python/pymake/tests/serial-rule-execution2.mk
diff --git a/build/pymake/tests/serial-toparallel.mk b/python/pymake/tests/serial-toparallel.mk
index a980badc7..a980badc7 100644
--- a/build/pymake/tests/serial-toparallel.mk
+++ b/python/pymake/tests/serial-toparallel.mk
diff --git a/build/pymake/tests/shellfunc.mk b/python/pymake/tests/shellfunc.mk
index 1e408dbac..1e408dbac 100644
--- a/build/pymake/tests/shellfunc.mk
+++ b/python/pymake/tests/shellfunc.mk
diff --git a/build/pymake/tests/simple-makeflags.mk b/python/pymake/tests/simple-makeflags.mk
index c7c92ec9d..c7c92ec9d 100644
--- a/build/pymake/tests/simple-makeflags.mk
+++ b/python/pymake/tests/simple-makeflags.mk
diff --git a/build/pymake/tests/sort.mk b/python/pymake/tests/sort.mk
index e1313ad5c..e1313ad5c 100644
--- a/build/pymake/tests/sort.mk
+++ b/python/pymake/tests/sort.mk
diff --git a/build/pymake/tests/specified-target.mk b/python/pymake/tests/specified-target.mk
index 3b23fbf69..3b23fbf69 100644
--- a/build/pymake/tests/specified-target.mk
+++ b/python/pymake/tests/specified-target.mk
diff --git a/build/pymake/tests/static-pattern.mk b/python/pymake/tests/static-pattern.mk
index f613b8c9a..f613b8c9a 100644
--- a/build/pymake/tests/static-pattern.mk
+++ b/python/pymake/tests/static-pattern.mk
diff --git a/build/pymake/tests/static-pattern2.mk b/python/pymake/tests/static-pattern2.mk
index 08ed834fd..08ed834fd 100644
--- a/build/pymake/tests/static-pattern2.mk
+++ b/python/pymake/tests/static-pattern2.mk
diff --git a/build/pymake/tests/subdir/delayload.py b/python/pymake/tests/subdir/delayload.py
index bdd6669db..bdd6669db 100644
--- a/build/pymake/tests/subdir/delayload.py
+++ b/python/pymake/tests/subdir/delayload.py
diff --git a/build/pymake/tests/subdir/pymod.py b/python/pymake/tests/subdir/pymod.py
index 1a47d8af2..1a47d8af2 100644
--- a/build/pymake/tests/subdir/pymod.py
+++ b/python/pymake/tests/subdir/pymod.py
diff --git a/build/pymake/tests/subdir/testmodule.py b/python/pymake/tests/subdir/testmodule.py
index 05b2f821a..05b2f821a 100644
--- a/build/pymake/tests/subdir/testmodule.py
+++ b/python/pymake/tests/subdir/testmodule.py
diff --git a/build/pymake/tests/submake-path.makefile2 b/python/pymake/tests/submake-path.makefile2
index 1266db7d1..1266db7d1 100644
--- a/build/pymake/tests/submake-path.makefile2
+++ b/python/pymake/tests/submake-path.makefile2
diff --git a/build/pymake/tests/submake-path.mk b/python/pymake/tests/submake-path.mk
index b6432276d..b6432276d 100644
--- a/build/pymake/tests/submake-path.mk
+++ b/python/pymake/tests/submake-path.mk
diff --git a/build/pymake/tests/submake.makefile2 b/python/pymake/tests/submake.makefile2
index 12ce94834..12ce94834 100644
--- a/build/pymake/tests/submake.makefile2
+++ b/python/pymake/tests/submake.makefile2
diff --git a/build/pymake/tests/submake.mk b/python/pymake/tests/submake.mk
index 41e47134b..41e47134b 100644
--- a/build/pymake/tests/submake.mk
+++ b/python/pymake/tests/submake.mk
diff --git a/build/pymake/tests/subprocess-path.mk b/python/pymake/tests/subprocess-path.mk
index f63921414..f63921414 100644
--- a/build/pymake/tests/subprocess-path.mk
+++ b/python/pymake/tests/subprocess-path.mk
diff --git a/build/pymake/tests/tab-intro.mk b/python/pymake/tests/tab-intro.mk
index 1c25ce747..1c25ce747 100644
--- a/build/pymake/tests/tab-intro.mk
+++ b/python/pymake/tests/tab-intro.mk
diff --git a/build/pymake/tests/target-specific.mk b/python/pymake/tests/target-specific.mk
index 217ed155e..217ed155e 100644
--- a/build/pymake/tests/target-specific.mk
+++ b/python/pymake/tests/target-specific.mk
diff --git a/build/pymake/tests/unexport.mk b/python/pymake/tests/unexport.mk
index 424411603..424411603 100644
--- a/build/pymake/tests/unexport.mk
+++ b/python/pymake/tests/unexport.mk
diff --git a/build/pymake/tests/unexport.submk b/python/pymake/tests/unexport.submk
index 8db6163de..8db6163de 100644
--- a/build/pymake/tests/unexport.submk
+++ b/python/pymake/tests/unexport.submk
diff --git a/build/pymake/tests/unterminated-dollar.mk b/python/pymake/tests/unterminated-dollar.mk
index dee9a207b..dee9a207b 100644
--- a/build/pymake/tests/unterminated-dollar.mk
+++ b/python/pymake/tests/unterminated-dollar.mk
diff --git a/build/pymake/tests/var-change-flavor.mk b/python/pymake/tests/var-change-flavor.mk
index 0cccf0bd6..0cccf0bd6 100644
--- a/build/pymake/tests/var-change-flavor.mk
+++ b/python/pymake/tests/var-change-flavor.mk
diff --git a/build/pymake/tests/var-commandline.mk b/python/pymake/tests/var-commandline.mk
index e2cdad457..e2cdad457 100644
--- a/build/pymake/tests/var-commandline.mk
+++ b/python/pymake/tests/var-commandline.mk
diff --git a/build/pymake/tests/var-overrides.mk b/python/pymake/tests/var-overrides.mk
index bd0765d19..bd0765d19 100644
--- a/build/pymake/tests/var-overrides.mk
+++ b/python/pymake/tests/var-overrides.mk
diff --git a/build/pymake/tests/var-ref.mk b/python/pymake/tests/var-ref.mk
index 3bc1886f9..3bc1886f9 100644
--- a/build/pymake/tests/var-ref.mk
+++ b/python/pymake/tests/var-ref.mk
diff --git a/build/pymake/tests/var-set.mk b/python/pymake/tests/var-set.mk
index 1603e7a35..1603e7a35 100644
--- a/build/pymake/tests/var-set.mk
+++ b/python/pymake/tests/var-set.mk
diff --git a/build/pymake/tests/var-substitutions.mk b/python/pymake/tests/var-substitutions.mk
index d5627d7bd..d5627d7bd 100644
--- a/build/pymake/tests/var-substitutions.mk
+++ b/python/pymake/tests/var-substitutions.mk
diff --git a/build/pymake/tests/vpath-directive-dynamic.mk b/python/pymake/tests/vpath-directive-dynamic.mk
index 9aa1bf956..9aa1bf956 100644
--- a/build/pymake/tests/vpath-directive-dynamic.mk
+++ b/python/pymake/tests/vpath-directive-dynamic.mk
diff --git a/build/pymake/tests/vpath-directive.mk b/python/pymake/tests/vpath-directive.mk
index 4c7d4bf39..4c7d4bf39 100644
--- a/build/pymake/tests/vpath-directive.mk
+++ b/python/pymake/tests/vpath-directive.mk
diff --git a/build/pymake/tests/vpath.mk b/python/pymake/tests/vpath.mk
index 06f52180c..06f52180c 100644
--- a/build/pymake/tests/vpath.mk
+++ b/python/pymake/tests/vpath.mk
diff --git a/build/pymake/tests/vpath2.mk b/python/pymake/tests/vpath2.mk
index be73ffe5c..be73ffe5c 100644
--- a/build/pymake/tests/vpath2.mk
+++ b/python/pymake/tests/vpath2.mk
diff --git a/build/pymake/tests/wildcards.mk b/python/pymake/tests/wildcards.mk
index 24ff3f14c..24ff3f14c 100644
--- a/build/pymake/tests/wildcards.mk
+++ b/python/pymake/tests/wildcards.mk
diff --git a/build/pymake/tests/windows-paths.mk b/python/pymake/tests/windows-paths.mk
index 5f33a9050..5f33a9050 100644
--- a/build/pymake/tests/windows-paths.mk
+++ b/python/pymake/tests/windows-paths.mk