Bug 589168: Combine code-coverage scripts into a platform generic script. The compile/test csv files match what is currently being done for code coverage. (r+dscahffe, r+jsudduth)
authorBrent Baker <brbaker@adobe.com>
Wed, 08 Sep 2010 11:18:48 -0400
changeset 5170 e4dccd893941938c7b1780e90d9d41eeca9e1c41
parent 5169 caeacbbbf49b862e88df06581116032d1fc644c1
child 5171 79a15c45e054e9ebde896bd60b976e82d8d82563
child 5172 f1f097296a49049db3d727e6fa224e077b6710f5
push id2796
push userbrbaker@adobe.com
push dateWed, 08 Sep 2010 15:19:44 +0000
bugs589168
Bug 589168: Combine code-coverage scripts into a platform generic script. The compile/test csv files match what is currently being done for code coverage. (r+dscahffe, r+jsudduth)
build/buildbot/master/commonsteps.py
build/buildbot/master/tamarinredux.py
build/buildbot/slaves/all/codecoverage-compile.csv
build/buildbot/slaves/all/codecoverage-process.sh
build/buildbot/slaves/all/codecoverage-runner.py
build/buildbot/slaves/all/codecoverage-test.csv
build/buildbot/slaves/all/compile-generic.sh
build/buildbot/slaves/linux-deep/scripts/coverage-build-check.sh
build/buildbot/slaves/linux-deep/scripts/coverage-build-debug-debugger.sh
build/buildbot/slaves/linux-deep/scripts/coverage-build-debug.sh
build/buildbot/slaves/linux-deep/scripts/coverage-build-release-debugger.sh
build/buildbot/slaves/linux-deep/scripts/coverage-build-release.sh
build/buildbot/slaves/linux-deep/scripts/coverage-process.sh
build/buildbot/slaves/linux-deep/scripts/coverage-run-acceptance-debug-debugger.sh
build/buildbot/slaves/linux-deep/scripts/coverage-run-acceptance-debug.sh
build/buildbot/slaves/linux-deep/scripts/coverage-run-acceptance-release-debugger.sh
build/buildbot/slaves/linux-deep/scripts/coverage-run-acceptance-release-interp.sh
build/buildbot/slaves/linux-deep/scripts/coverage-run-acceptance-release-jit.sh
build/buildbot/slaves/linux-deep/scripts/coverage-run-acceptance-release.sh
build/buildbot/slaves/linux-deep/scripts/coverage-run-selftest.sh
build/buildbot/slaves/linux-deep/scripts/env32
build/buildbot/slaves/linux-deep/scripts/environment.sh
build/buildbot/slaves/linux-deep/scripts/run-code-coverage.sh
build/buildbot/slaves/mac-deep/scripts/coverage-build-check.sh
build/buildbot/slaves/mac-deep/scripts/coverage-build-debug-debugger.sh
build/buildbot/slaves/mac-deep/scripts/coverage-build-debug.sh
build/buildbot/slaves/mac-deep/scripts/coverage-build-release-debugger.sh
build/buildbot/slaves/mac-deep/scripts/coverage-build-release.sh
build/buildbot/slaves/mac-deep/scripts/coverage-process.sh
build/buildbot/slaves/mac-deep/scripts/coverage-run-acceptance-debug-debugger.sh
build/buildbot/slaves/mac-deep/scripts/coverage-run-acceptance-debug.sh
build/buildbot/slaves/mac-deep/scripts/coverage-run-acceptance-release-debugger.sh
build/buildbot/slaves/mac-deep/scripts/coverage-run-acceptance-release-interp.sh
build/buildbot/slaves/mac-deep/scripts/coverage-run-acceptance-release-jit.sh
build/buildbot/slaves/mac-deep/scripts/coverage-run-acceptance-release.sh
build/buildbot/slaves/mac-deep/scripts/coverage-run-selftest.sh
build/buildbot/slaves/mac-deep/scripts/env32
build/buildbot/slaves/mac-deep/scripts/env64
build/buildbot/slaves/mac-deep/scripts/run-code-coverage.sh
build/buildbot/slaves/windows-deep/scripts/coverage-build-check.sh
build/buildbot/slaves/windows-deep/scripts/coverage-build-debug-debugger.sh
build/buildbot/slaves/windows-deep/scripts/coverage-build-debug.sh
build/buildbot/slaves/windows-deep/scripts/coverage-build-release-debugger.sh
build/buildbot/slaves/windows-deep/scripts/coverage-build-release.sh
build/buildbot/slaves/windows-deep/scripts/coverage-process.sh
build/buildbot/slaves/windows-deep/scripts/coverage-run-acceptance-debug-debugger.sh
build/buildbot/slaves/windows-deep/scripts/coverage-run-acceptance-debug.sh
build/buildbot/slaves/windows-deep/scripts/coverage-run-acceptance-release-debugger.sh
build/buildbot/slaves/windows-deep/scripts/coverage-run-acceptance-release-interp.sh
build/buildbot/slaves/windows-deep/scripts/coverage-run-acceptance-release-jit.sh
build/buildbot/slaves/windows-deep/scripts/coverage-run-acceptance-release.sh
build/buildbot/slaves/windows-deep/scripts/coverage-run-selftest.sh
build/buildbot/slaves/windows-deep/scripts/environment.sh
build/buildbot/slaves/windows-deep/scripts/run-code-coverage.sh
build/buildbot/slaves/windows64-deep/scripts/env32
build/buildbot/slaves/windows64-deep/scripts/env64
build/buildbot/slaves/windows64-deep/scripts/environment.sh
--- a/build/buildbot/master/commonsteps.py
+++ b/build/buildbot/master/commonsteps.py
@@ -419,24 +419,35 @@ perf_release_arm_jit = PerfShellCommand(
             command=['../all/run-performance-release-arm-jit.sh', WithProperties('%s','revision')],
             env={'branch': WithProperties('%s','branch'), 'silent':WithProperties('%s','silent')},
             description='starting release-jit performance tests...',
             descriptionDone='finished release-jit performance tests.',
             name='ReleaseJIT',
             timeout=3600,
             workdir="../repo/build/buildbot/slaves/scripts")
 
-deep_codecoverage = BuildShellCommand(
-            command=['./run-code-coverage.sh', WithProperties('%s','revision')],
+def deep_codecoverage(compilecsv, testcsv):
+    return BuildShellCommand(
+            command=['../all/codecoverage-runner.py', '--buildnum=%s' % WithProperties('%s','revision'), '--compilecsv=%s' % compilecsv, '--testcsv=%s' % testcsv],
             env={'branch': WithProperties('%s','branch'), 'silent':WithProperties('%s','silent')},
             description='starting code coverage...',
             descriptionDone='finished code coverage',
             name='CodeCoverage',
             timeout=3600,
-            workdir="../repo/build/buildbot/slaves/scripts")
+            workdir="../repo/build/buildbot/slaves/scripts"
+            )
+
+deep_codecoverage_process = BuildShellCommand(
+            command=['../all/codecoverage-process.sh', WithProperties('%s','revision')],
+            env={'branch': WithProperties('%s','branch'), 'silent':WithProperties('%s','silent')},
+            description='starting to process coverage data...',
+            descriptionDone='finished processing coverage data',
+            name='CodeCoverageProcess',
+            workdir="../repo/build/buildbot/slaves/scripts"
+            )
 
 deep_release_esc = BuildShellCommand(
             command=['../all/run-release-esc.sh', WithProperties('%s','revision')],
             env={'branch': WithProperties('%s','branch'), 'silent':WithProperties('%s','silent')},
             description='starting release-esc tests...',
             descriptionDone='finished release-esc tests.',
             name='Release-esc',
             workdir="../repo/build/buildbot/slaves/scripts")
--- a/build/buildbot/master/tamarinredux.py
+++ b/build/buildbot/master/tamarinredux.py
@@ -1782,17 +1782,16 @@ class tamarinredux:
     ##################################
     windows_deep_factory = factory.BuildFactory()
     windows_deep_factory.addStep(sync_clean)
     windows_deep_factory.addStep(sync_clone(url=HG_URL))
     windows_deep_factory.addStep(sync_update)
     windows_deep_factory.addStep(bb_slaveupdate(slave="windows-deep"))
     windows_deep_factory.addStep(download_testmedia)
     windows_deep_factory.addStep(deep_release_esc)
-    windows_deep_factory.addStep(deep_codecoverage)
     windows_deep_factory.addStep(test_misc)
     windows_deep_factory.addStep(test_selftest(name="Debug", shellname="avmshell_d"))
     windows_deep_factory.addStep(test_selftest(name="ReleaseDebugger", shellname="avmshell_s"))
     windows_deep_factory.addStep(test_selftest(name="DebugDebugger", shellname="avmshell_sd"))
     windows_deep_factory.addStep(compile_generic(name="ReleaseDebugger-air", shellname="avmshell_air", args="--enable-shell --enable-override-global-new --enable-use-system-malloc --enable-debugger", upload="true"))
     windows_deep_factory.addStep(test_generic(name="ReleaseDebugger-air", shellname="avmshell_air", vmargs="", config="", scriptargs=""))
     windows_deep_factory.addStep(test_generic(name="Release-Dgreedy", shellname="avmshell", vmargs="-Dgreedy", config="", scriptargs="--timeout=180 --random"))
     windows_deep_factory.addStep(test_generic(name="DebugDebugger_VerifyAll", shellname="avmshell_sd", vmargs="", config="", scriptargs="--verify --timeout=300 --random"))
@@ -1846,17 +1845,18 @@ class tamarinredux:
                      command=['./run-brightspot.sh', WithProperties('%s','revision')],
                      env={'branch': WithProperties('%s','branch'), 'silent':WithProperties('%s','silent')},
                      description='running brightspot tests...',
                      descriptionDone='finished running brightspot tests.',
                      name="RunBrightspot",
                      workdir="../repo/build/buildbot/slaves/scripts",
                      timeout=3600)
     )
-    mac_deep_factory.addStep(deep_codecoverage)
+    mac_deep_factory.addStep(deep_codecoverage(compilecsv="../all/codecoverage-compile.csv", testcsv="../all/codecoverage-test.csv"))
+    mac_deep_factory.addStep(deep_codecoverage_process)
     mac_deep_factory.addStep(util_process_clean)
     mac_deep_factory.addStep(util_clean_buildsdir)
 
     mac_deep_builder = {
                 'name': "mac-deep",
                 'slavename': "mac-deep",
                 'factory': mac_deep_factory,
                 'builddir': './mac-deep',
@@ -2018,16 +2018,18 @@ class tamarinredux:
                 name="Testsuite_Differential3264",
                 workdir="../repo/build/buildbot/slaves/scripts"
                 )
     )
     windows_64_deep_factory.addStep(test_misc)
     windows_64_deep_factory.addStep(test_generic(name="Release-Dgreedy", shellname="avmshell_64", vmargs="-Dgreedy", config="", scriptargs="--timeout=180 --random"))
     windows_64_deep_factory.addStep(test_generic(name="DebugDebugger_VerifyAll", shellname="avmshell_sd_64", vmargs="", config="", scriptargs="--verify --timeout=300 --random"))
     windows_64_deep_factory.addStep(test_generic(name="DebugDebugger_VerifyOnly", shellname="avmshell_sd_64", vmargs="", config="", scriptargs="--verifyonly --timeout=300 --random"))
+    windows_64_deep_factory.addStep(deep_codecoverage(compilecsv="../all/codecoverage-compile.csv", testcsv="../all/codecoverage-test.csv"))
+    windows_64_deep_factory.addStep(deep_codecoverage_process)
     windows_64_deep_factory.addStep(util_process_clean)
     windows_64_deep_factory.addStep(util_clean_buildsdir)
 
     windows_64_deep_builder = {
                 'name': "windows64-deep",
                 'slavename': "windows64-deep",
                 'factory': windows_64_deep_factory,
                 'builddir': './windows64-deep',
@@ -2071,22 +2073,23 @@ class tamarinredux:
     linux_deep_factory.addStep(test_generic(name="Release-Djitordie", shellname="avmshell", vmargs="-Djitordie", config="", scriptargs=""))
     linux_deep_factory.addStep(test_generic(name="ReleaseDebugger-nodebugger", shellname="avmshell_s", vmargs="-Dnodebugger", config="", scriptargs=""))
     linux_deep_factory.addStep(test_generic(name="DebugDebugger-nodebugger", shellname="avmshell_sd", vmargs="-Dnodebugger", config="", scriptargs=""))
     linux_deep_factory.addStep(compile_generic(name="Release-nojit", shellname="avmshell_nojit", args="--enable-shell --disable-jit", upload="true"))
     linux_deep_factory.addStep(test_generic(name="Release-nojit", shellname="avmshell_nojit", vmargs="", config="x86-lnx-tvm-release-nojit", scriptargs=""))
     linux_deep_factory.addStep(compile_generic(name="Release-system-malloc", shellname="avmshell_sysmalloc", args="--enable-shell --enable-use-system-malloc", upload="true"))
     linux_deep_factory.addStep(test_generic(name="Release-system-malloc", shellname="avmshell_sysmalloc", vmargs="", config="x86-lnx-tvm-release-use-system-malloc", scriptargs=""))
     linux_deep_factory.addStep(test_misc)
-    linux_deep_factory.addStep(deep_codecoverage)
     linux_deep_factory.addStep(compile_generic(name="ReleaseDebugger-air", shellname="avmshell_air", args="--enable-shell --enable-override-global-new --enable-use-system-malloc --enable-debugger", upload="true"))
     linux_deep_factory.addStep(test_generic(name="ReleaseDebugger-air", shellname="avmshell_air", vmargs="", config="", scriptargs=""))
     linux_deep_factory.addStep(test_generic(name="Release-Dgreedy", shellname="avmshell", vmargs="-Dgreedy", config="", scriptargs="--timeout=180 --random"))
     linux_deep_factory.addStep(test_generic(name="DebugDebugger_VerifyAll", shellname="avmshell_sd", vmargs="", config="", scriptargs="--verify --timeout=300 --random"))
     linux_deep_factory.addStep(test_generic(name="DebugDebugger_VerifyOnly", shellname="avmshell_sd", vmargs="", config="", scriptargs="--verifyonly --timeout=300 --random"))
+    linux_deep_factory.addStep(deep_codecoverage(compilecsv="../all/codecoverage-compile.csv", testcsv="../all/codecoverage-test.csv"))
+    linux_deep_factory.addStep(deep_codecoverage_process)
     linux_deep_factory.addStep(util_process_clean)
     linux_deep_factory.addStep(util_clean_buildsdir)
 
     linux_deep_builder = {
                 'name': "linux-deep",
                 'slavename': "linux-deep",
                 'factory': linux_deep_factory,
                 'builddir': './linux-deep',
new file mode 100644
--- /dev/null
+++ b/build/buildbot/slaves/all/codecoverage-compile.csv
@@ -0,0 +1,5 @@
+display_name, shell_name, configure options, env_script, notes
+Release32, avmshell_cov, --enable-shell, env32, "Release 32bit"
+ReleaseDebugger32, avmshell_s_cov, --enable-shell --enable-debugger, env32, "ReleaseDebugger 32bit"
+Debug32, avmshell_d_cov, --enable-shell --enable-debug, env32, "Debug 32bit"
+DebugDebugger32, avmshell_sd_cov, --enable-shell --enable-debug --enable-debugger, env32, "DebugDebugger 32bit"
new file mode 100755
--- /dev/null
+++ b/build/buildbot/slaves/all/codecoverage-process.sh
@@ -0,0 +1,160 @@
+#!/bin/bash
+#  ***** BEGIN LICENSE BLOCK *****
+#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
+# 
+#  The contents of this file are subject to the Mozilla Public License Version
+#  1.1 (the "License"); you may not use this file except in compliance with
+#  the License. You may obtain a copy of the License at
+#  http://www.mozilla.org/MPL/
+# 
+#  Software distributed under the License is distributed on an "AS IS" basis,
+#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+#  for the specific language governing rights and limitations under the
+#  License.
+# 
+#  The Original Code is [Open Source Virtual Machine.].
+# 
+#  The Initial Developer of the Original Code is
+#  Adobe System Incorporated.
+#  Portions created by the Initial Developer are Copyright (C) 2010
+#  the Initial Developer. All Rights Reserved.
+# 
+#  Contributor(s):
+#    Adobe AS3 Team
+# 
+#  Alternatively, the contents of this file may be used under the terms of
+#  either the GNU General Public License Version 2 or later (the "GPL"), or
+#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+#  in which case the provisions of the GPL or the LGPL are applicable instead
+#  of those above. If you wish to allow use of your version of this file only
+#  under the terms of either the GPL or the LGPL, and not to allow others to
+#  use your version of this file under the terms of the MPL, indicate your
+#  decision by deleting the provisions above and replace them with the notice
+#  and other provisions required by the GPL or the LGPL. If you do not delete
+#  the provisions above, a recipient may use your version of this file under
+#  the terms of any one of the MPL, the GPL or the LGPL.
+# 
+#  ***** END LICENSE BLOCK ****
+(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
+
+
+##
+# Bring in the environment variables
+##
+. ./environment.sh
+
+
+##
+# Calculate the change number and change id
+##
+. ../all/util-calculate-change.sh $1
+
+
+export COVFILE=$buildsdir/${change}-${changeid}/$platform/avm.cov
+test -f $COVFILE && rm -f $COVFILE
+
+cd $buildsdir/${change}-${changeid}/$platform/
+files=`ls *.cov`
+
+$bullseyedir/covmerge -c $files
+
+cd ${basedir}
+$bullseyedir/covdir -q -m
+fnpct=`$bullseyedir/covdir -q -m | grep Total | awk '{print $6}'`
+cdpct=`$bullseyedir/covdir -q -m | grep Total | awk '{print $11}'`
+
+
+
+echo "message: total function coverage:           $fnpct"
+echo "message: total condition/decision coverage: $cdpct"
+
+. ${basedir}/build/buildbot/slaves/all/util-upload-ftp-asteam.sh $COVFILE $ftp_asteam/$branch/${change}-${changeid}/$platform/avm.cov
+
+echo "url: http://10.60.48.47/builds/$branch/${change}-${changeid}/${platform}/avm.cov code coverage data file avm.cov"
+
+# Current known platforms generating coverage data:
+platforms="windows mac linux"
+covfiles="" # this will get built up by looping over the platforms
+
+# Get the coverage files for all platforms. If all files are not avaible, stop.
+# Only continue processing if ALL platforms are complete.
+for platform in ${platforms}
+do
+    covfiles+="$platform/avm.cov "
+    if [ ! -e "$buildsdir/${change}-${changeid}/$platform/avm.cov" ]; then
+	echo "Downloading $platform/avm.cov"
+	${basedir}/build/buildbot/slaves/all/util-download.sh $vmbuilds$branch/${change}-${changeid}/$platform/avm.cov $buildsdir/${change}-${changeid}/$platform/avm.cov
+	ret=$?
+	test "$ret" = "0" || {
+            echo "Downloading of $platform/avm.cov failed"
+            rm -f $buildsdir/${change}-${changeid}/$platform/avm.cov
+	    echo "Not all coverage files are available so stop processing"
+            exit 0
+	}
+    fi
+done
+
+# Merge all coverage files into a single file and upload
+mkdir $buildsdir/${change}-${changeid}/coverage
+export COVFILE=$buildsdir/${change}-${changeid}/coverage/avm.cov
+test -f $COVFILE && rm -f $COVFILE
+
+echo $covfiles
+cd $buildsdir/${change}-${changeid}
+$bullseyedir/covmerge -c $covfiles
+
+
+cd ${basedir}
+$bullseyedir/covdir -q -m
+fnpct=`$bullseyedir/covdir -q -m | grep Total | awk '{print $6}'`
+cdpct=`$bullseyedir/covdir -q -m | grep Total | awk '{print $11}'`
+
+
+
+echo "message: combined total function coverage:           $fnpct"
+echo "message: combined total condition/decision coverage: $cdpct"
+
+. ${basedir}/build/buildbot/slaves/all/util-upload-ftp-asteam.sh $COVFILE $ftp_asteam/$branch/${change}-${changeid}/coverage/avm.cov
+echo "url: http://10.60.48.47/builds/$branch/${change}-${changeid}/coverage/avm.cov combined code coverage data file avm.cov"
+
+# Remove current coverage files
+ssh ${coverage_host} "cd ${coverage_dir}/latest; rm *.cov"
+
+# Post all of the coverage files to the 'latest' directory
+for platform in ${platforms}
+do
+    echo; echo "Uploading avm-${platform}-${change}.cov ..."
+    . ${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $buildsdir/${change}-${changeid}/$platform/avm.cov ${scp_coverage}/latest/avm-${platform}-${change}.cov
+done
+echo; echo "Uploading avm-${change}.cov ..."
+. ${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $buildsdir/${change}-${changeid}/coverage/avm.cov ${scp_coverage}/latest/avm-${change}.cov
+
+echo; echo "Updating code coverage reports..."
+covdatadir=$buildsdir/${change}-${changeid}/coverage
+# set pwd to code root for covfn to produce correct relative path
+cd $basedir
+
+# download current historical files
+${basedir}/build/buildbot/slaves/all/util-download.sh $http_coverage/codecoverage-fn-summary.csv $covdatadir/codecoverage-fn-summary.csv
+${basedir}/build/buildbot/slaves/all/util-download.sh $http_coverage/codecoverage-fnpercent-summary.csv $covdatadir/codecoverage-fnpercent-summary.csv
+${basedir}/build/buildbot/slaves/all/util-download.sh $http_coverage/codecoverage-bc-summary.csv $covdatadir/codecoverage-bc-summary.csv
+${basedir}/build/buildbot/slaves/all/util-download.sh $http_coverage/codecoverage-bcpercent-summary.csv $covdatadir/codecoverage-bcpercent-summary.csv
+
+# parse code coverage data and generate csv reports
+${basedir}/build/buildbot/slaves/all/util-parse-codecoverage.py --covfile=$covdatadir/avm.cov --build=$change --skips=$coverage_skips --datadir=$covdatadir
+result=$?
+test "$result" = "0" || {
+    echo "message: error ${basedir}/build/buildbot/slaves/all/util-parse-codecoverage.py failed"
+    exit 1
+}
+
+# upload csv reports
+${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage-fn-summary.csv ${scp_coverage}/codecoverage-fn-summary.csv
+${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage-fnpercent-summary.csv ${scp_coverage}/codecoverage-fnpercent-summary.csv
+${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage-bc-summary.csv ${scp_coverage}/codecoverage-bc-summary.csv
+${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage-bcpercent-summary.csv ${scp_coverage}/codecoverage-bcpercent-summary.csv
+${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage-fn-summary.csv ${scp_coverage}/codecoverage-fn-summary.csv
+${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage-info.csv ${scp_coverage}/codecoverage-info.csv
+${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage-summary.csv ${scp_coverage}/codecoverage-summary.csv
+${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage-missingfn.csv ${scp_coverage}/latest/codecoverage-missingfn.csv
+${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage.csv ${scp_coverage}/latest/codecoverage.csv
new file mode 100755
--- /dev/null
+++ b/build/buildbot/slaves/all/codecoverage-runner.py
@@ -0,0 +1,449 @@
+#!/usr/bin/env python
+# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4 -*-
+# vi: set ts=4 sw=4 expandtab: (add to ~/.vimrc: set modeline modelines=5)
+#
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is [Open Source Virtual Machine.].
+#
+# The Initial Developer of the Original Code is
+# Adobe System Incorporated.
+# Portions created by the Initial Developer are Copyright (C) 2010
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Adobe AS3 Team
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK ***** */
+#
+
+
+import getopt,os,re,subprocess,sys,datetime,shutil,platform
+
+class CodeCoverageRunner:
+    compile_csvfile="../all/codecoverage-compile.csv"
+    test_csvfile="../all/codecoverage-test.csv"
+    root_dir="../../../../"
+    script_dir="./"
+    buildnum=None
+    bullseye_dir=None
+    builds_dir=None
+    platform=None
+    
+    options=''
+    longOptions=['buildnum=','compilecsv=','testcsv=']
+    
+    def __init__(self):
+        self.parseOptions()
+        self.determineOS()
+
+        # Make sure that bullseyedir is set in the environment
+        env=os.environ
+        if env.has_key("bullseyedir") == False:
+            print("error: must set bullseyedir environment variable to the bullseye/bin directory")
+            sys.exit(1)
+
+        self.bullseye_dir=env["bullseyedir"]
+
+        # Determine the hash of the change, required to know what the build directory is
+        out,exit = self.run_pipe(cmd="hg log -r %s | head -n 1 | awk -F: '{print $3}'" % self.buildnum)
+        if out[0].find("unknown revision")!=-1:
+            print "Unable to determine change has for hg revision %s" % (self.buildnum)
+            sys.exit(1)
+        self.builds_dir="../../../../../builds/%s-%s/%s" % (self.buildnum, out[0], self.platform)
+
+        # Convert all relative paths to absolute
+        self.builds_dir=os.path.abspath(self.builds_dir)
+        self.root_dir=os.path.abspath(self.root_dir)
+        self.script_dir=os.path.abspath(self.script_dir)
+        
+        if self.platform=='windows':
+            self.compile_csvfile=self.convertFromCygwin(self.compile_csvfile)
+            self.test_csvfile=self.convertFromCygwin(self.test_csvfile)
+            self.root_dir=self.convertFromCygwin(self.root_dir)
+            self.script_dir=self.convertFromCygwin(self.script_dir)
+            self.bullseye_dir=self.convertFromCygwin(self.bullseye_dir)
+            self.builds_dir=self.convertFromCygwin(self.builds_dir)
+
+        
+        compile=True
+        test=True
+
+        
+        if compile:
+            print('parsing %s...' % self.compile_csvfile)
+            lines=open(self.compile_csvfile).read()
+            # throw away header(1st)
+            lines=lines.split('\n')[1:]
+            for line in lines:
+                if line.startswith("#"):
+                    continue
+                tokens=self.mysplit(line)
+                # current format is:
+                # display_name, shell_name, configure options, env_script, notes
+                if len(tokens)<5:
+                    continue
+                shellname=tokens[1].strip()
+                configure_args=tokens[2].strip()
+                env_script=tokens[3].strip()
+                self.compile_shell(shellname, configure_args, env_script)
+            
+        if test:
+            print('parsing %s...' % self.test_csvfile)
+            lines=open(self.test_csvfile).read()
+            # throw away header(1st)
+            lines=lines.split('\n')[1:]
+            for line in lines:
+                if line.startswith("#"):
+                    continue
+                tokens=self.mysplit(line)
+                # current format is:
+                # shell_name, suite, vm_args, config_string, script_args
+                if len(tokens)<5:
+                    continue
+                shellname=tokens[0].strip()
+                suite=tokens[1].strip()
+                vm_args=tokens[2].strip()
+                config_string=tokens[3].strip()
+                script_args=tokens[4].strip()
+
+                self.test_shell(shellname, suite, vm_args, config_string, script_args)
+
+        # Merge all of the coverage files together
+        # let the build system call ../all/codecoverage_process.sh
+        #self.merge_coverage()
+        
+    def usage(self,c):
+        print('usage: %s [options]' % sys.argv[0])
+        print('    --buildnum    build number that is being built')
+        print('    --compilecsv  csv file defining what to compile,')
+        print('                  defaults to %s' % self.compile_csvfile)
+        print('    --testcsv     csv file defining what test to run,')
+        print('                  defaults to %s' % self.test_csvfile)
+        sys.exit(c)
+
+    def parseOptions(self):
+        try:
+            opts,args = getopt.getopt(sys.argv[1:], self.options,self.longOptions)
+        except:
+            print(sys.exc_info()[1])
+            self.usage(2)
+
+        for o,v in opts:
+            if o in ('--buildnum'):
+                self.buildnum=v
+            if o in ('--compilecsv'):
+                self.compile_csvfile=v
+            if o in ('--testcsv'):
+                self.test_csvfile=v
+            
+        if self.buildnum==None:
+            print('--buildnum must be set')
+            self.usage(1)
+            
+    def compile_shell(self, shellname, configure_args, env_script):
+        '''
+        Compile the shell with the given configure args.
+        '''
+        print "\n\n========================================"
+        print "About to compile using the following: "
+        print "shellname: "+shellname
+        print "configure_args: "+configure_args
+        print "env_script: "+env_script
+        
+        # Make sure that Bullseye is in the path
+        env=os.environ
+        if env["PATH"].find(self.bullseye_dir)==-1:
+            env["PATH"]=self.bullseye_dir+":"+env["PATH"]
+
+        # Setup the covfile based on the shellname being built
+        env["COVFILE"]="%s/%s.cov" % (self.builds_dir, shellname)
+        if os.path.exists(env["COVFILE"]):
+            os.unlink(env["COVFILE"])
+
+        # Make sure that the builds dir exists before starting the build
+        # otherwise the covc process will fail creating the coverage file
+        if not os.path.exists(self.builds_dir):
+            os.makedirs(self.builds_dir)
+
+
+        # Need to load up the env_script:
+        #  - maintain original env variables that are being modified so that
+        #    it can be reset once the subprocess call is completed
+        #  - execute a replace() if the value contains the key name, substituting
+        #    the original env value for the $KEY token
+        env_orig=dict()
+        env_script=self.script_dir+"/"+env_script
+        lines=open(env_script).read()
+        lines=lines.split('\n')
+        for line in lines:
+            if line.startswith("#"):
+                continue
+            if line.startswith("CONFIGURE_ARGS="):
+                env["CONFIGURE_ARGS"]=line[len("CONFIGURE_ARGS="):]
+                continue
+            
+            pattern = re.compile(r'^.*\=')
+            m = pattern.match(line)
+            if m:
+                key=m.group()[:-1]
+                value=line[len(key)+1:]
+                value_orig=None
+                if env.has_key(key):
+                    value_orig=env[key]
+                env_orig[key]=value_orig
+
+                # Is there a $key token string that we need to replace?
+                if value.find("$%s" % key)>-1:
+                    value=value.replace("$%s" % key, value_orig)
+
+                # Set the environment
+                env[key]=value
+        
+        
+        # Turn on code coverage
+        cmd="%s/cov01 --on" % self.bullseye_dir
+        stdout,exit = self.run_pipe(cmd=cmd, env=env)
+        for line in stdout:
+            print line
+
+        # Use the compile-generic script to compile the shell
+        cmd="../all/compile-generic.sh '%s' '%s' '%s' " % (self.buildnum, configure_args, shellname)
+        stdout,exit = self.run_pipe(cmd=cmd, env=env)
+        for line in stdout:
+            print line
+        if exit:
+            print("\n\naborting code coverage run")
+            print("message: Build %s failed" % shellname)
+            sys.exit(exit)
+        
+        # Turn off code coverage
+        cmd="%s/cov01 --off" % self.bullseye_dir
+        stdout,exit = self.run_pipe(cmd=cmd, env=env)
+        for line in stdout:
+            print line
+        
+        # Set the environ back to its original state
+        for key in env_orig:
+            # If there is an original value set it back
+            if env_orig[key]:
+                env[key]=env_orig[key]
+            else: # There was no original value so delete the key/value
+                del env[key]
+
+
+    def test_shell(self, shellname, suite, vm_args="", config_string="", script_args=""):
+        print "\n\n========================================"
+        print "About to run tests using the following: "
+        print "shellname: "+shellname
+        print "suite: "+suite
+        print "vm_args: "+vm_args
+        print "config_string: "+config_string
+        print "script_args: "+script_args
+        # Make sure that Bullseye is in the path
+        env=os.environ
+        if env["PATH"].find(self.bullseye_dir)==-1:
+            env["PATH"]=self.bullseye_dir+":"+env["PATH"]
+
+        # Setup the covfile based on the shellname being built
+        env["COVFILE"]="%s/%s.cov" % (self.builds_dir, shellname)
+
+        if suite=="acceptance":
+            print "running acceptance"
+            # Use the compile-generic script to compile the shell
+            cmd="../all/run-acceptance-generic.sh '%s' '%s' '%s' '%s' '%s'" % (self.buildnum, shellname, vm_args, config_string, script_args)
+            stdout,exit = self.run_pipe(cmd=cmd, env=env)
+            for line in stdout:
+                print line
+            
+        elif suite=="performance":
+            print "running performance"
+            env["AVM"]="%s/%s" % (self.builds_dir, shellname)
+            env["ASC"]="%s/utils/asc.jar" % (self.root_dir)
+            env["BUILTINABC"]="%s/core/builtin.abc" % (self.root_dir)
+            env["SHELLABC"]="%s/shell/shell_toplevel.abc" % (self.root_dir)
+            cmd="python runtests.py %s" % script_args
+            stdout,exit = self.run_pipe(cmd=cmd, env=env, cwd="%s/test/performance"%self.root_dir)
+            for line in stdout:
+                print line
+            del env["AVM"]
+            del env["ASC"]
+            del env["BUILTINABC"]
+            del env["SHELLABC"]
+
+        elif suite=="selftest":
+            print "running selftest"
+            cmd="%s/%s -Dselftest %s" % (self.builds_dir, shellname, vm_args)
+            stdout,exit = self.run_pipe(cmd=cmd, env=env)
+            for line in stdout:
+                print line
+
+        elif suite=="commandline":
+            print "running commandline"
+
+            env["AVM"]="%s/%s" % (self.builds_dir, shellname)
+            env["ASC"]="%s/utils/asc.jar" % (self.root_dir)
+            env["BUILTINABC"]="%s/core/builtin.abc" % (self.root_dir)
+            env["SHELLABC"]="%s/shell/shell_toplevel.abc" % (self.root_dir)
+            # Determine if the shell contains a debugger
+            debugger=False
+            cmd="%s/%s -Dversion" % (self.builds_dir, shellname)
+            stdout,exit = self.run_pipe(cmd=cmd, env=env)
+            for line in stdout:
+     
+                if line!=None and line.find("AVMFEATURE_DEBUGGER")>-1:
+                    debugger=True
+                    env["AVMRD"]="%s/%s" % (self.builds_dir, shellname)
+            print "Are we running with debugger: %s" % debugger
+            cmd="python runtests.py"
+            stdout,exit = self.run_pipe(cmd=cmd, env=env, cwd="%s/test/cmdline"%self.root_dir)
+            for line in stdout:
+                print line
+            del env["AVM"]
+            del env["ASC"]
+            del env["BUILTINABC"]
+            del env["SHELLABC"]
+            if debugger:
+                del env["AVMRD"]
+            
+        # Get the current coverage data, execute from the root_dir so that path information is correct
+        cmd="%s/covdir -q -m" % self.bullseye_dir
+        stdout,exit = self.run_pipe(cmd=cmd, env=env, cwd=self.root_dir)
+        for line in stdout:
+            print line
+
+
+    def merge_coverage(self):
+        print "\n\n========================================"
+        print "Merging all coverage files together"
+        # Make sure that Bullseye is in the path
+        env=os.environ
+        if env["PATH"].find(self.bullseye_dir)==-1:
+            env["PATH"]=self.bullseye_dir+":"+env["PATH"]
+
+        # Setup the covfile based on the shellname being built
+        env["COVFILE"]="%s/avmshell_%s.cov" % (self.builds_dir, self.platform)
+        if os.path.exists(env["COVFILE"]):
+            os.unlink(env["COVFILE"])
+        
+        covfiles=""
+        for file in os.listdir(self.builds_dir):
+            if file.endswith(".cov"):
+                covfiles+=" %s"%file
+        
+        # Get the current coverage data, execute from the root_dir so that path information is correct
+        cmd="%s/covmerge -c %s" % (self.bullseye_dir, covfiles)
+        stdout,exit = self.run_pipe(cmd=cmd, env=env, cwd=self.builds_dir)
+        for line in stdout:
+            print line
+            
+        # Get the current coverage data, execute from the root_dir so that path information is correct
+        cmd="%s/covdir -q -m" % self.bullseye_dir
+        stdout,exit = self.run_pipe(cmd=cmd, env=env, cwd=self.root_dir)
+        Total=None
+        for line in stdout:
+            if line.startswith("Total"):
+                Total=line
+            print line
+
+        print ""
+        print "message: total function coverage:           %s" % Total.split()[5]
+        print "message: total condition/decision coverage: %s" % Total.split()[10]
+        
+
+    def run_pipe(self, cmd, cwd=None, env=None):
+        if cwd==None:
+            cwd=self.script_dir
+        # run a command and return a tuple of (output, exitCode)
+        if env==None:
+            process = subprocess.Popen(cmd,cwd=cwd,shell=True,stdout=subprocess.PIPE,stderr=subprocess.STDOUT)
+        else:
+            process = subprocess.Popen(cmd,cwd=cwd,shell=True,env=env,stdout=subprocess.PIPE,stderr=subprocess.STDOUT)
+        
+        (output,err) = process.communicate()
+        output = output.split('\n') if output else []
+        if output and output[-1].strip() == '': # strip empty line at end
+            output = output[:-1]
+
+        exitCode = process.returncode
+        return (output,exitCode)
+
+    # workaround since python split does not allow " to span multiple tokens
+    # "func1(param1,param)","foo","foo" would not split correctly
+    def mysplit(self,line):
+        tokens=[]
+        while True:
+            if len(line)==0:
+                break
+            if line[0]=='"':
+                line=line[1:]
+                if line.find('"')==-1:
+                    tokens.append(line)
+                    break
+                tokens.append(line[0:line.find('"')])
+                line=line[line.find('"')+2:]
+            else:
+                if line.find(',')==-1:
+                    tokens.append(line)
+                    break
+                else:
+                    tokens.append(line[0:line.find(',')])
+                    line=line[line.find(',')+1:]
+        return tokens
+
+
+    def convertFromCygwin(self, cygpath):
+        if cygpath.find('\\') == -1:
+            try:
+                f = self.run_pipe('cygpath -m %s' % cygpath)
+                cygpath = ' '.join([i.strip() for i in f[0]])
+            except:
+                pass
+            return cygpath
+
+    def determineOS(self):
+        _os = platform.system()
+        ostype = ''
+
+        if re.search('(CYGWIN_NT)', _os):
+            ostype='windows'
+            self.cygwin = True
+        if re.search('(Windows)', _os):
+            ostype='windows'
+            self.useShell = False
+        if re.search('(Darwin)', _os):
+            ostype='mac'
+        if re.search('(Linux)', _os):
+            ostype='linux'
+        
+        if ostype == '':
+            print("ERROR: os %s is unknown" % (platform.system()))
+            exit(1)
+
+        self.platform = ostype
+
+if __name__ == '__main__':
+    p = CodeCoverageRunner()
new file mode 100644
--- /dev/null
+++ b/build/buildbot/slaves/all/codecoverage-test.csv
@@ -0,0 +1,8 @@
+shell_name, suite, vm_args, config_string, script_args
+avmshell_cov, acceptance, , , 
+avmshell_cov, acceptance, -Dinterp, , 
+avmshell_cov, acceptance, -Ojit, , 
+avmshell_s_cov, acceptance, , , 
+avmshell_d_cov, acceptance, , , 
+avmshell_sd_cov, acceptance, , , 
+avmshell_cov, selftest, , , 
--- a/build/buildbot/slaves/all/compile-generic.sh
+++ b/build/buildbot/slaves/all/compile-generic.sh
@@ -59,16 +59,21 @@ showhelp ()
     echo "       <upload>       (true|false) upload shell to server"
     exit 1
 }
 
 config=$2
 test "$config" = "" && {
     showhelp
 }
+test "$CONFIGURE_ARGS" != "" && {
+    echo "CONFIGURE_ARGS=$CONFIGURE_ARGS, appending to config"
+    config="$config $CONFIGURE_ARGS"
+}
+
 filename=$3
 test "$filename" = "" && {
     showhelp
 }
 
 upload=$4
 test "$upload" = "true" || {
     upload=false
deleted file mode 100755
--- a/build/buildbot/slaves/linux-deep/scripts/coverage-build-check.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2009-2010
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-
-# Release
-test -f $buildsdir/$change-${changeid}/$platform/$shell_release_cov || {
-  echo "message: Release Failed"
-  fail=1
-}
-
-# Release_Debugger
-test -f $buildsdir/$change-${changeid}/$platform/$shell_release_debugger_cov || {
-  echo "message: Release_Debugger Failed"
-  fail=1
-}
-
-# Debug
-test -f $buildsdir/$change-${changeid}/$platform/$shell_debug_cov || {
-  echo "message: Debug Failed"
-  fail=1
-}
-
-#Debug_Debugger
-test -f $buildsdir/$change-${changeid}/$platform/$shell_debug_debugger_cov || {
-  echo "message: Debug_Debugger Failed"
-  fail=1
-}
-
-
-if test "${fail}" = 1; then
-   echo Failing the build
-   exit 1
-fi
-
-
-
deleted file mode 100755
--- a/build/buildbot/slaves/linux-deep/scripts/coverage-build-debug-debugger.sh
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2009-2010
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-
-##
-# Update the version string
-##
-. ../all/util-update-version.sh
-
-
-# Need to have bullseye at the start of the PATH
-export PATH=$bullseyedir:$PATH
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/debug_debugger.cov
-# MUST set COVSRCDIR otherwise some file will be relative and other absolute
-# Seems like cpp files are relative and header files are absolute, this was
-# causing some problems with viewing coverage based on directory, since there
-# would be 2 directories, one relative and one absolute
-# Actually need to have it relative so that we can merge from multiple machines
-#export COVSRCDIR=
-
-# Make sure that the directory structure is created, bullseye will fail otherwise
-mkdir -p $buildsdir/${change}-${changeid}/$platform
-
-# Remove the generated coverage file if it already exists
-test -f $COVFILE && rm -f $COVFILE
-
-# Turn on bullseye code coverage
-$bullseyedir/cov01 --on
-
-##
-# Execute the common build script.
-# Just need to pass in a dummy additional args string ($2) and then the 
-# name of the executable that we want ($3)
-##
-cd $basedir/build/buildbot/slaves/scripts/
-../all/compile-generic.sh $change "--enable-shell --enable-debug --enable-debugger" ${build_shell_debug_debugger_cov}
-
-
-
deleted file mode 100755
--- a/build/buildbot/slaves/linux-deep/scripts/coverage-build-debug.sh
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2009-2010
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-
-##
-# Update the version string
-##
-. ../all/util-update-version.sh
-
-
-# Need to have bullseye at the start of the PATH
-export PATH=$bullseyedir:$PATH
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/debug.cov
-# MUST set COVSRCDIR otherwise some file will be relative and other absolute
-# Seems like cpp files are relative and header files are absolute, this was
-# causing some problems with viewing coverage based on directory, since there
-# would be 2 directories, one relative and one absolute
-# Actually need to have it relative so that we can merge from multiple machines
-#export COVSRCDIR=
-
-# Make sure that the directory structure is created, bullseye will fail otherwise
-mkdir -p $buildsdir/${change}-${changeid}/$platform
-
-# Remove the generated coverage file if it already exists
-test -f $COVFILE && rm -f $COVFILE
-
-# Turn on bullseye code coverage
-$bullseyedir/cov01 --on
-
-##
-# Execute the common build script.
-# Just need to pass in a dummy additional args string ($2) and then the 
-# name of the executable that we want ($3)
-##
-cd $basedir/build/buildbot/slaves/scripts/
-../all/compile-generic.sh $change "--enable-shell --enable-debug" ${build_shell_debug_cov}
-
-
-
deleted file mode 100755
--- a/build/buildbot/slaves/linux-deep/scripts/coverage-build-release-debugger.sh
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2009-2010
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-
-##
-# Update the version string
-##
-. ../all/util-update-version.sh
-
-
-# Need to have bullseye at the start of the PATH
-export PATH=$bullseyedir:$PATH
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/release_debugger.cov
-# MUST set COVSRCDIR otherwise some file will be relative and other absolute
-# Seems like cpp files are relative and header files are absolute, this was
-# causing some problems with viewing coverage based on directory, since there
-# would be 2 directories, one relative and one absolute
-# Actually need to have it relative so that we can merge from multiple machines
-#export COVSRCDIR=
-
-# Make sure that the directory structure is created, bullseye will fail otherwise
-mkdir -p $buildsdir/${change}-${changeid}/$platform
-
-# Remove the generated coverage file if it already exists
-test -f $COVFILE && rm -f $COVFILE
-
-# Turn on bullseye code coverage
-$bullseyedir/cov01 --on
-
-##
-# Execute the common build script.
-# Just need to pass in a dummy additional args string ($2) and then the 
-# name of the executable that we want ($3)
-##
-cd $basedir/build/buildbot/slaves/scripts/
-../all/compile-generic.sh $change "--enable-shell --enable-debugger" ${build_shell_release_debugger_cov}
-
-
-
deleted file mode 100755
--- a/build/buildbot/slaves/linux-deep/scripts/coverage-build-release.sh
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2009-2010
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-
-##
-# Update the version string
-##
-. ../all/util-update-version.sh
-
-
-# Need to have bullseye at the start of the PATH
-export PATH=$bullseyedir:$PATH
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/release.cov
-# MUST set COVSRCDIR otherwise some file will be relative and other absolute
-# Seems like cpp files are relative and header files are absolute, this was
-# causing some problems with viewing coverage based on directory, since there
-# would be 2 directories, one relative and one absolute
-# Actually need to have it relative so that we can merge from multiple machines
-#export COVSRCDIR=
-
-# Make sure that the directory structure is created, bullseye will fail otherwise
-mkdir -p $buildsdir/${change}-${changeid}/$platform
-
-# Remove the generated coverage file if it already exists
-test -f $COVFILE && rm -f $COVFILE
-
-# Turn on bullseye code coverage
-$bullseyedir/cov01 --on
-
-##
-# Execute the common build script.
-# Just need to pass in a dummy additional args string ($2) and then the 
-# name of the executable that we want ($3)
-##
-cd $basedir/build/buildbot/slaves/scripts/
-../all/compile-generic.sh $change "--enable-shell" ${build_shell_release_cov}
-
-
-
deleted file mode 100755
--- a/build/buildbot/slaves/linux-deep/scripts/coverage-process.sh
+++ /dev/null
@@ -1,161 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2009-2010
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/avm.cov
-test -f $COVFILE && rm -f $COVFILE
-
-cd $buildsdir/${change}-${changeid}/$platform/
-files=`ls *.cov`
-
-$bullseyedir/covmerge -c $files
-
-cd ${basedir}
-$bullseyedir/covdir -q -m
-fnpct=`$bullseyedir/covdir -q -m | grep Total | awk '{print $6}'`
-cdpct=`$bullseyedir/covdir -q -m | grep Total | awk '{print $11}'`
-
-
-
-echo "message: total function coverage:           $fnpct"
-echo "message: total condition/decision coverage: $cdpct"
-
-. ${basedir}/build/buildbot/slaves/all/util-upload-ftp-asteam.sh $COVFILE $ftp_asteam/$branch/${change}-${changeid}/$platform/avm.cov
-
-echo "url: http://10.60.48.47/builds/$branch/${change}-${changeid}/${platform}/avm.cov code coverage data file avm.cov"
-
-
-# Current known platforms generating coverage data:
-platforms="windows mac linux"
-covfiles="" # this will get built up by looping over the platforms
-
-# Get the coverage files for all platforms. If all files are not avaible, stop.
-# Only continue processing if ALL platforms are complete.
-for platform in ${platforms}
-do
-    covfiles+="$platform/avm.cov "
-    if [ ! -e "$buildsdir/${change}-${changeid}/$platform/avm.cov" ]; then
-	echo "Downloading $platform/avm.cov"
-	${basedir}/build/buildbot/slaves/all/util-download.sh $vmbuilds$branch/${change}-${changeid}/$platform/avm.cov $buildsdir/${change}-${changeid}/$platform/avm.cov
-	ret=$?
-	test "$ret" = "0" || {
-            echo "Downloading of $platform/avm.cov failed"
-            rm -f $buildsdir/${change}-${changeid}/$platform/avm.cov
-	    echo "Not all coverage files are available so stop processing"
-            exit 0
-	}
-    fi
-done
-
-# Merge all coverage files into a single file and upload
-mkdir $buildsdir/${change}-${changeid}/coverage
-export COVFILE=$buildsdir/${change}-${changeid}/coverage/avm.cov
-test -f $COVFILE && rm -f $COVFILE
-
-echo $covfiles
-cd $buildsdir/${change}-${changeid}
-$bullseyedir/covmerge -c $covfiles
-
-cd ${basedir}
-$bullseyedir/covdir -q -m
-fnpct=`$bullseyedir/covdir -q -m | grep Total | awk '{print $6}'`
-cdpct=`$bullseyedir/covdir -q -m | grep Total | awk '{print $11}'`
-
-
-
-echo "message: combined total function coverage:           $fnpct"
-echo "message: combined total condition/decision coverage: $cdpct"
-
-. ${basedir}/build/buildbot/slaves/all/util-upload-ftp-asteam.sh $COVFILE $ftp_asteam/$branch/${change}-${changeid}/coverage/avm.cov
-echo "url: http://10.60.48.47/builds/$branch/${change}-${changeid}/coverage/avm.cov combined code coverage data file avm.cov"
-
-# Remove current coverage files
-ssh ${coverage_host} "cd ${coverage_dir}/latest; rm *.cov"
-
-# Post all of the coverage files to the 'latest' directory
-for platform in ${platforms}
-do
-    echo; echo "Uploading avm-${platform}-${change}.cov ..."
-    . ${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $buildsdir/${change}-${changeid}/$platform/avm.cov ${scp_coverage}/latest/avm-${platform}-${change}.cov
-done
-echo; echo "Uploading avm-${change}.cov ..."
-. ${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $buildsdir/${change}-${changeid}/coverage/avm.cov ${scp_coverage}/latest/avm-${change}.cov
-
-
-echo; echo "Updating code coverage reports..."
-covdatadir=$buildsdir/${change}-${changeid}/coverage
-# set pwd to code root for covfn to produce correct relative path
-cd $basedir
-
-# download current historical files
-${basedir}/build/buildbot/slaves/all/util-download.sh $http_coverage/codecoverage-fn-summary.csv $covdatadir/codecoverage-fn-summary.csv
-${basedir}/build/buildbot/slaves/all/util-download.sh $http_coverage/codecoverage-fnpercent-summary.csv $covdatadir/codecoverage-fnpercent-summary.csv
-${basedir}/build/buildbot/slaves/all/util-download.sh $http_coverage/codecoverage-bc-summary.csv $covdatadir/codecoverage-bc-summary.csv
-${basedir}/build/buildbot/slaves/all/util-download.sh $http_coverage/codecoverage-bcpercent-summary.csv $covdatadir/codecoverage-bcpercent-summary.csv
-
-# parse code coverage data and generate csv reports
-${basedir}/build/buildbot/slaves/all/util-parse-codecoverage.py --covfile=$covdatadir/avm.cov --build=$change --skips=$coverage_skips --datadir=$covdatadir
-result=$?
-test "$result" = "0" || {
-    echo "message: error ${basedir}/build/buildbot/slaves/all/util-parse-codecoverage.py failed"
-    exit 1
-}
-
-# upload csv reports
-${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage-fn-summary.csv ${scp_coverage}/codecoverage-fn-summary.csv
-${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage-fnpercent-summary.csv ${scp_coverage}/codecoverage-fnpercent-summary.csv
-${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage-bc-summary.csv ${scp_coverage}/codecoverage-bc-summary.csv
-${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage-bcpercent-summary.csv ${scp_coverage}/codecoverage-bcpercent-summary.csv
-${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage-fn-summary.csv ${scp_coverage}/codecoverage-fn-summary.csv
-${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage-info.csv ${scp_coverage}/codecoverage-info.csv
-${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage-summary.csv ${scp_coverage}/codecoverage-summary.csv
-${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage-missingfn.csv ${scp_coverage}/latest/codecoverage-missingfn.csv
-${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage.csv ${scp_coverage}/latest/codecoverage.csv
deleted file mode 100755
--- a/build/buildbot/slaves/linux-deep/scripts/coverage-run-acceptance-debug-debugger.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2009-2010
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-##
-# Download the latest asc.jar if it does not exist
-##
-if [ ! -e "$basedir/utils/asc.jar" ]; then
-    echo "Download asc.jar"
-    ../all/util-download.sh $ascbuilds/asc.jar $basedir/utils/asc.jar
-    ret=$?
-    test "$ret" = "0" || {
-        echo "Downloading of asc.jar failed"
-        rm -f $basedir/utils/asc.jar
-        exit 1
-    }
-fi
-
-echo ""
-echo "Missing media will be compiled using the following ASC version:"
-echo "`java -jar $basedir/utils/asc.jar`"
-echo ""
-
-
-
-export ASC=$basedir/utils/asc.jar
-export BUILTINABC=$basedir/core/$builtinABC
-export SHELLABC=$basedir/shell/$shellABC
-export AVM=$buildsdir/${change}-${changeid}/${platform}/${shell_debug_debugger_cov}
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/debug_debugger.cov
-
-echo AVM=$AVM
-test -f $AVM || {
-  echo "ERROR: $AVM not found"
-  exit 1
-}
-
-echo AVM=$AVM
-echo "`$AVM`"
-echo; echo "AVM built with the following options:"
-echo "`$AVM -Dversion`"
-
-
-##
-# Ensure that the system is clean and ready
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-clean.sh
-
-cd ${basedir}/test/acceptance
-
-# If available, use windows python (instead of cygwin python)
-# Threading only works with windows python, $PYTHONWIN env variable must point to windows install
-# $PYTHONWIN must be defined with forward slashes, e.g: c:/Python26/python.exe
-if [ -z "$PYTHONWIN" ]
-then
-    py=python
-else
-    py=$PYTHONWIN
-fi
-
-echo "message: $py ./runtests.py --config=x86-lnx-tvm-cov-debugdebugger   --notimecheck"
-$py ./runtests.py --config=x86-lnx-tvm-cov-debugdebugger   --notimecheck
-$bullseyedir/covdir -q
-
-##
-# Ensure that the system is torn down and clean
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-teardown.sh
deleted file mode 100755
--- a/build/buildbot/slaves/linux-deep/scripts/coverage-run-acceptance-debug.sh
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2009-2010
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-##
-# Download the latest asc.jar if it does not exist
-##
-if [ ! -e "$basedir/utils/asc.jar" ]; then
-    echo "Download asc.jar"
-    ../all/util-download.sh $ascbuilds/asc.jar $basedir/utils/asc.jar
-    ret=$?
-    test "$ret" = "0" || {
-        echo "Downloading of asc.jar failed"
-        rm -f $basedir/utils/asc.jar
-        exit 1
-    }
-fi
-
-echo ""
-echo "Missing media will be compiled using the following ASC version:"
-echo "`java -jar $basedir/utils/asc.jar`"
-echo ""
-
-
-
-export ASC=$basedir/utils/asc.jar
-export BUILTINABC=$basedir/core/$builtinABC
-export SHELLABC=$basedir/shell/$shellABC
-export AVM=$buildsdir/${change}-${changeid}/${platform}/${shell_debug_cov}
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/debug.cov
-
-echo AVM=$AVM
-test -f $AVM || {
-  echo "ERROR: $AVM not found"
-  exit 1
-}
-
-echo AVM=$AVM
-echo "`$AVM`"
-echo; echo "AVM built with the following options:"
-echo "`$AVM -Dversion`"
-
-
-##
-# Ensure that the system is clean and ready
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-clean.sh
-
-cd ${basedir}/test/acceptance
-
-# If available, use windows python (instead of cygwin python)
-# Threading only works with windows python, $PYTHONWIN env variable must point to windows install
-# $PYTHONWIN must be defined with forward slashes, e.g: c:/Python26/python.exe
-if [ -z "$PYTHONWIN" ]
-then
-    py=python
-else
-    py=$PYTHONWIN
-fi
-
-
-echo "message: $py ./runtests.py --config=x86-lnx-tvm-cov-debug   --notimecheck"
-$py ./runtests.py --config=x86-lnx-tvm-cov-debug   --notimecheck
-$bullseyedir/covdir -q
-
-##
-# Ensure that the system is torn down and clean
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-teardown.sh
-
deleted file mode 100755
--- a/build/buildbot/slaves/linux-deep/scripts/coverage-run-acceptance-release-debugger.sh
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2009-2010
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-##
-# Download the latest asc.jar if it does not exist
-##
-if [ ! -e "$basedir/utils/asc.jar" ]; then
-    echo "Download asc.jar"
-    ../all/util-download.sh $ascbuilds/asc.jar $basedir/utils/asc.jar
-    ret=$?
-    test "$ret" = "0" || {
-        echo "Downloading of asc.jar failed"
-        rm -f $basedir/utils/asc.jar
-        exit 1
-    }
-fi
-
-echo ""
-echo "Missing media will be compiled using the following ASC version:"
-echo "`java -jar $basedir/utils/asc.jar`"
-echo ""
-
-
-
-export ASC=$basedir/utils/asc.jar
-export BUILTINABC=$basedir/core/$builtinABC
-export SHELLABC=$basedir/shell/$shellABC
-export AVM=$buildsdir/${change}-${changeid}/${platform}/${shell_release_debugger_cov}
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/release_debugger.cov
-
-echo AVM=$AVM
-test -f $AVM || {
-  echo "ERROR: $AVM not found"
-  exit 1
-}
-
-echo AVM=$AVM
-echo "`$AVM`"
-echo; echo "AVM built with the following options:"
-echo "`$AVM -Dversion`"
-
-
-##
-# Ensure that the system is clean and ready
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-clean.sh
-
-cd ${basedir}/test/acceptance
-
-# If available, use windows python (instead of cygwin python)
-# Threading only works with windows python, $PYTHONWIN env variable must point to windows install
-# $PYTHONWIN must be defined with forward slashes, e.g: c:/Python26/python.exe
-if [ -z "$PYTHONWIN" ]
-then
-    py=python
-else
-    py=$PYTHONWIN
-fi
-
-
-echo "message: $py ./runtests.py --config=x86-lnx-tvm-cov-releasedebugger   --notimecheck"
-$py ./runtests.py --config=x86-lnx-tvm-cov-releasedebugger   --notimecheck
-$bullseyedir/covdir -q
-
-##
-# Ensure that the system is torn down and clean
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-teardown.sh
deleted file mode 100755
--- a/build/buildbot/slaves/linux-deep/scripts/coverage-run-acceptance-release-interp.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2009-2010
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-##
-# Download the latest asc.jar if it does not exist
-##
-if [ ! -e "$basedir/utils/asc.jar" ]; then
-    echo "Download asc.jar"
-    ../all/util-download.sh $ascbuilds/asc.jar $basedir/utils/asc.jar
-    ret=$?
-    test "$ret" = "0" || {
-        echo "Downloading of asc.jar failed"
-        rm -f $basedir/utils/asc.jar
-        exit 1
-    }
-fi
-
-echo ""
-echo "Missing media will be compiled using the following ASC version:"
-echo "`java -jar $basedir/utils/asc.jar`"
-echo ""
-
-
-
-export ASC=$basedir/utils/asc.jar
-export BUILTINABC=$basedir/core/$builtinABC
-export SHELLABC=$basedir/shell/$shellABC
-export AVM=$buildsdir/${change}-${changeid}/${platform}/${shell_release_cov}
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/release.cov
-
-echo AVM=$AVM
-test -f $AVM || {
-  echo "ERROR: $AVM not found"
-  exit 1
-}
-
-echo AVM=$AVM
-echo "`$AVM`"
-echo; echo "AVM built with the following options:"
-echo "`$AVM -Dversion`"
-
-
-##
-# Ensure that the system is clean and ready
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-clean.sh
-
-cd ${basedir}/test/acceptance
-
-# If available, use windows python (instead of cygwin python)
-# Threading only works with windows python, $PYTHONWIN env variable must point to windows install
-# $PYTHONWIN must be defined with forward slashes, e.g: c:/Python26/python.exe
-if [ -z "$PYTHONWIN" ]
-then
-    py=python
-else
-    py=$PYTHONWIN
-fi
-
-echo "message: $py ./runtests.py --config=x86-lnx-tvm-cov-release-Dinterp   --notimecheck"
-$py ./runtests.py --config=x86-lnx-tvm-cov-release-Dinterp --vmargs=${interp}   --notimecheck
-$bullseyedir/covdir -q
-
-##
-# Ensure that the system is torn down and clean
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-teardown.sh
deleted file mode 100755
--- a/build/buildbot/slaves/linux-deep/scripts/coverage-run-acceptance-release-jit.sh
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2009-2010
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-##
-# Download the latest asc.jar if it does not exist
-##
-if [ ! -e "$basedir/utils/asc.jar" ]; then
-    echo "Download asc.jar"
-    ../all/util-download.sh $ascbuilds/asc.jar $basedir/utils/asc.jar
-    ret=$?
-    test "$ret" = "0" || {
-        echo "Downloading of asc.jar failed"
-        rm -f $basedir/utils/asc.jar
-        exit 1
-    }
-fi
-
-echo ""
-echo "Missing media will be compiled using the following ASC version:"
-echo "`java -jar $basedir/utils/asc.jar`"
-echo ""
-
-
-
-export ASC=$basedir/utils/asc.jar
-export BUILTINABC=$basedir/core/$builtinABC
-export SHELLABC=$basedir/shell/$shellABC
-export AVM=$buildsdir/${change}-${changeid}/${platform}/${shell_release_cov}
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/release.cov
-
-echo AVM=$AVM
-test -f $AVM || {
-  echo "ERROR: $AVM not found"
-  exit 1
-}
-
-echo AVM=$AVM
-echo "`$AVM`"
-echo; echo "AVM built with the following options:"
-echo "`$AVM -Dversion`"
-
-
-##
-# Ensure that the system is clean and ready
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-clean.sh
-
-cd ${basedir}/test/acceptance
-
-# If available, use windows python (instead of cygwin python)
-# Threading only works with windows python, $PYTHONWIN env variable must point to windows install
-# $PYTHONWIN must be defined with forward slashes, e.g: c:/Python26/python.exe
-if [ -z "$PYTHONWIN" ]
-then
-    py=python
-else
-    py=$PYTHONWIN
-fi
-
-
-echo "message: $py ./runtests.py --config=x86-lnx-tvm-cov-release-Ojit   --notimecheck"
-$py ./runtests.py --config=x86-lnx-tvm-cov-release-Ojit --vmargs=${jit}   --notimecheck
-$bullseyedir/covdir -q
-
-##
-# Ensure that the system is torn down and clean
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-teardown.sh
deleted file mode 100755
--- a/build/buildbot/slaves/linux-deep/scripts/coverage-run-acceptance-release.sh
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2009-2010
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-##
-# Download the latest asc.jar if it does not exist
-##
-if [ ! -e "$basedir/utils/asc.jar" ]; then
-    echo "Download asc.jar"
-    ../all/util-download.sh $ascbuilds/asc.jar $basedir/utils/asc.jar
-    ret=$?
-    test "$ret" = "0" || {
-        echo "Downloading of asc.jar failed"
-        rm -f $basedir/utils/asc.jar
-        exit 1
-    }
-fi
-
-echo ""
-echo "Missing media will be compiled using the following ASC version:"
-echo "`java -jar $basedir/utils/asc.jar`"
-echo ""
-
-
-
-export ASC=$basedir/utils/asc.jar
-export BUILTINABC=$basedir/core/$builtinABC
-export SHELLABC=$basedir/shell/$shellABC
-export AVM=$buildsdir/${change}-${changeid}/${platform}/${shell_release_cov}
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/release.cov
-
-echo AVM=$AVM
-test -f $AVM || {
-  echo "ERROR: $AVM not found"
-  exit 1
-}
-
-echo AVM=$AVM
-echo "`$AVM`"
-echo; echo "AVM built with the following options:"
-echo "`$AVM -Dversion`"
-
-
-##
-# Ensure that the system is clean and ready
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-clean.sh
-
-cd ${basedir}/test/acceptance
-
-# If available, use windows python (instead of cygwin python)
-# Threading only works with windows python, $PYTHONWIN env variable must point to windows install
-# $PYTHONWIN must be defined with forward slashes, e.g: c:/Python26/python.exe
-if [ -z "$PYTHONWIN" ]
-then
-    py=python
-else
-    py=$PYTHONWIN
-fi
-
-
-echo "message: $py ./runtests.py --config=x86-lnx-tvm-cov-release --notimecheck"
-$py ./runtests.py --config=x86-lnx-tvm-cov-release --notimecheck
-$bullseyedir/covdir -q
-
-##
-# Ensure that the system is torn down and clean
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-teardown.sh
deleted file mode 100755
--- a/build/buildbot/slaves/linux-deep/scripts/coverage-run-selftest.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2009-2010
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-export AVM=$buildsdir/${change}-${changeid}/${platform}/${shell_release_cov}
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/selftest.cov
-
-
-##
-# Ensure that the system is clean and ready
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-clean.sh
-
-$AVM -Dselftest
-$bullseyedir/covdir -q
-
-##
-# Ensure that the system is torn down and clean
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-teardown.sh
new file mode 100644
--- /dev/null
+++ b/build/buildbot/slaves/linux-deep/scripts/env32
@@ -0,0 +1,3 @@
+# CONFIGURE_ARGS are appeneded to the arguments passed to configure.py
+
+
--- a/build/buildbot/slaves/linux-deep/scripts/environment.sh
+++ b/build/buildbot/slaves/linux-deep/scripts/environment.sh
@@ -54,13 +54,13 @@ export shell_release_debugger_cov=avmshe
 export shell_debug_cov=avmshell_d_cov
 export shell_debug_debugger_cov=avmshell_sd_cov
 
 export build_shell_release_cov=avmshell_cov
 export build_shell_release_debugger_cov=avmshell_s_cov
 export build_shell_debug_cov=avmshell_d_cov
 export build_shell_debug_debugger_cov=avmshell_sd_cov
 
-bullseyedir=/home/build/tools/bullseye/bin
+export bullseyedir=/home/build/tools/bullseye/bin
 
 ## Used by make in the build scripts
 export make_opt="-j2"
 
deleted file mode 100755
--- a/build/buildbot/slaves/linux-deep/scripts/run-code-coverage.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2009-2010
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-set -x  # activate debugging
-../all/build-builtinabc.sh $change:$changeid
-./coverage-build-release.sh $change:$changeid
-./coverage-build-debug.sh $change:$changeid
-./coverage-build-release-debugger.sh $change:$changeid
-./coverage-build-debug-debugger.sh $change:$changeid
-
-
-./coverage-build-check.sh $change:$changeid
-res=$?
-test "$res" = "0" || {
-    echo "Build check failed"
-    exit 1
-}
-
-../all/download-acceptance-tests.sh $change:$changeid
-./coverage-run-selftest.sh $change:$changeid
-./coverage-run-acceptance-release.sh $change:$changeid
-./coverage-run-acceptance-release-interp.sh $change:$changeid
-./coverage-run-acceptance-release-jit.sh $change:$changeid
-./coverage-run-acceptance-release-debugger.sh $change:$changeid
-./coverage-run-acceptance-debug.sh $change:$changeid
-./coverage-run-acceptance-debug-debugger.sh $change:$changeid
-
-./coverage-process.sh
\ No newline at end of file
deleted file mode 100755
--- a/build/buildbot/slaves/mac-deep/scripts/coverage-build-check.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2009-2010
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-
-# Release
-test -f $buildsdir/$change-${changeid}/$platform/$shell_release_cov || {
-  echo "message: Release Failed"
-  fail=1
-}
-
-# Release_Debugger
-test -f $buildsdir/$change-${changeid}/$platform/$shell_release_debugger_cov || {
-  echo "message: Release_Debugger Failed"
-  fail=1
-}
-
-# Debug
-test -f $buildsdir/$change-${changeid}/$platform/$shell_debug_cov || {
-  echo "message: Debug Failed"
-  fail=1
-}
-
-#Debug_Debugger
-test -f $buildsdir/$change-${changeid}/$platform/$shell_debug_debugger_cov || {
-  echo "message: Debug_Debugger Failed"
-  fail=1
-}
-
-
-if test "${fail}" = 1; then
-   echo Failing the build
-   exit 1
-fi
-
-
-
deleted file mode 100755
--- a/build/buildbot/slaves/mac-deep/scripts/coverage-build-debug-debugger.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2010
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-
-##
-# Update the version string
-##
-. ../all/util-update-version.sh
-
-
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/debug_debugger.cov
-# MUST set COVSRCDIR otherwise some file will be relative and other absolute
-# Seems like cpp files are relative and header files are absolute, this was
-# causing some problems with viewing coverage based on directory, since there
-# would be 2 directories, one relative and one absolute
-# Actually need to have it relative so that we can merge from multiple machines
-#export COVSRCDIR=
-
-# Make sure that the directory structure is created, bullseye will fail otherwise
-mkdir -p $buildsdir/${change}-${changeid}/$platform
-
-# Remove the generated coverage file if it already exists
-test -f $COVFILE && rm -f $COVFILE
-
-# Turn on bullseye code coverage
-$bullseyedir/cov01 --on
-export PATH=$bullseyedir:$PATH
-
-##
-# Execute the common build script.
-# Just need to pass in a dummy additional args string ($2) and then the 
-# name of the executable that we want ($3)
-##
-cd $basedir/build/buildbot/slaves/scripts/
-../all/compile-generic.sh $change "--enable-shell --enable-debug --enable-debugger" ${build_shell_debug_debugger_cov}
-
-
-
deleted file mode 100755
--- a/build/buildbot/slaves/mac-deep/scripts/coverage-build-debug.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2010
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-
-##
-# Update the version string
-##
-. ../all/util-update-version.sh
-
-
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/debug.cov
-# MUST set COVSRCDIR otherwise some file will be relative and other absolute
-# Seems like cpp files are relative and header files are absolute, this was
-# causing some problems with viewing coverage based on directory, since there
-# would be 2 directories, one relative and one absolute
-# Actually need to have it relative so that we can merge from multiple machines
-#export COVSRCDIR=
-
-# Make sure that the directory structure is created, bullseye will fail otherwise
-mkdir -p $buildsdir/${change}-${changeid}/$platform
-
-# Remove the generated coverage file if it already exists
-test -f $COVFILE && rm -f $COVFILE
-
-# Turn on bullseye code coverage
-$bullseyedir/cov01 --on
-export PATH=$bullseyedir:$PATH
-
-##
-# Execute the common build script.
-# Just need to pass in a dummy additional args string ($2) and then the 
-# name of the executable that we want ($3)
-##
-cd $basedir/build/buildbot/slaves/scripts/
-../all/compile-generic.sh $change "--enable-shell --enable-debug" ${build_shell_debug_cov}
-
-
-
deleted file mode 100755
--- a/build/buildbot/slaves/mac-deep/scripts/coverage-build-release-debugger.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2010
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-
-##
-# Update the version string
-##
-. ../all/util-update-version.sh
-
-
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/release_debugger.cov
-# MUST set COVSRCDIR otherwise some file will be relative and other absolute
-# Seems like cpp files are relative and header files are absolute, this was
-# causing some problems with viewing coverage based on directory, since there
-# would be 2 directories, one relative and one absolute
-# Actually need to have it relative so that we can merge from multiple machines
-#export COVSRCDIR=
-
-# Make sure that the directory structure is created, bullseye will fail otherwise
-mkdir -p $buildsdir/${change}-${changeid}/$platform
-
-# Remove the generated coverage file if it already exists
-test -f $COVFILE && rm -f $COVFILE
-
-# Turn on bullseye code coverage
-$bullseyedir/cov01 --on
-export PATH=$bullseyedir:$PATH
-
-##
-# Execute the common build script.
-# Just need to pass in a dummy additional args string ($2) and then the 
-# name of the executable that we want ($3)
-##
-cd $basedir/build/buildbot/slaves/scripts/
-../all/compile-generic.sh $change "--enable-shell --enable-debugger" ${build_shell_release_debugger_cov}
-
-
-
deleted file mode 100755
--- a/build/buildbot/slaves/mac-deep/scripts/coverage-build-release.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2010
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-
-##
-# Update the version string
-##
-. ../all/util-update-version.sh
-
-
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/release.cov
-# MUST set COVSRCDIR otherwise some file will be relative and other absolute
-# Seems like cpp files are relative and header files are absolute, this was
-# causing some problems with viewing coverage based on directory, since there
-# would be 2 directories, one relative and one absolute
-# Actually need to have it relative so that we can merge from multiple machines
-#export COVSRCDIR=
-
-# Make sure that the directory structure is created, bullseye will fail otherwise
-mkdir -p $buildsdir/${change}-${changeid}/$platform
-
-# Remove the generated coverage file if it already exists
-test -f $COVFILE && rm -f $COVFILE
-
-# Turn on bullseye code coverage
-$bullseyedir/cov01 --on
-export PATH=$bullseyedir:$PATH
-
-##
-# Execute the common build script.
-# Just need to pass in a dummy additional args string ($2) and then the 
-# name of the executable that we want ($3)
-##
-cd $basedir/build/buildbot/slaves/scripts/
-../all/compile-generic.sh $change "--enable-shell" ${build_shell_release_cov}
-
-
-
deleted file mode 100755
--- a/build/buildbot/slaves/mac-deep/scripts/coverage-process.sh
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2010
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/avm.cov
-test -f $COVFILE && rm -f $COVFILE
-
-cd $buildsdir/${change}-${changeid}/$platform/
-files=`ls *.cov`
-
-$bullseyedir/covmerge -c $files
-
-cd ${basedir}
-$bullseyedir/covdir -q -m
-fnpct=`$bullseyedir/covdir -q -m | grep Total | awk '{print $6}'`
-cdpct=`$bullseyedir/covdir -q -m | grep Total | awk '{print $11}'`
-
-
-
-echo "message: total function coverage:           $fnpct"
-echo "message: total condition/decision coverage: $cdpct"
-
-. ${basedir}/build/buildbot/slaves/all/util-upload-ftp-asteam.sh $COVFILE $ftp_asteam/$branch/${change}-${changeid}/$platform/avm.cov
-
-echo "url: http://10.60.48.47/builds/$branch/${change}-${changeid}/${platform}/avm.cov code coverage data file avm.cov"
-
-# Current known platforms generating coverage data:
-platforms="windows mac linux"
-covfiles="" # this will get built up by looping over the platforms
-
-# Get the coverage files for all platforms. If all files are not avaible, stop.
-# Only continue processing if ALL platforms are complete.
-for platform in ${platforms}
-do
-    covfiles+="$platform/avm.cov "
-    if [ ! -e "$buildsdir/${change}-${changeid}/$platform/avm.cov" ]; then
-	echo "Downloading $platform/avm.cov"
-	${basedir}/build/buildbot/slaves/all/util-download.sh $vmbuilds$branch/${change}-${changeid}/$platform/avm.cov $buildsdir/${change}-${changeid}/$platform/avm.cov
-	ret=$?
-	test "$ret" = "0" || {
-            echo "Downloading of $platform/avm.cov failed"
-            rm -f $buildsdir/${change}-${changeid}/$platform/avm.cov
-	    echo "Not all coverage files are available so stop processing"
-            exit 0
-	}
-    fi
-done
-
-# Merge all coverage files into a single file and upload
-mkdir $buildsdir/${change}-${changeid}/coverage
-export COVFILE=$buildsdir/${change}-${changeid}/coverage/avm.cov
-test -f $COVFILE && rm -f $COVFILE
-
-echo $covfiles
-cd $buildsdir/${change}-${changeid}
-$bullseyedir/covmerge -c $covfiles
-
-
-cd ${basedir}
-$bullseyedir/covdir -q -m
-fnpct=`$bullseyedir/covdir -q -m | grep Total | awk '{print $6}'`
-cdpct=`$bullseyedir/covdir -q -m | grep Total | awk '{print $11}'`
-
-
-
-echo "message: combined total function coverage:           $fnpct"
-echo "message: combined total condition/decision coverage: $cdpct"
-
-. ${basedir}/build/buildbot/slaves/all/util-upload-ftp-asteam.sh $COVFILE $ftp_asteam/$branch/${change}-${changeid}/coverage/avm.cov
-echo "url: http://10.60.48.47/builds/$branch/${change}-${changeid}/coverage/avm.cov combined code coverage data file avm.cov"
-
-# Remove current coverage files
-ssh ${coverage_host} "cd ${coverage_dir}/latest; rm *.cov"
-
-# Post all of the coverage files to the 'latest' directory
-for platform in ${platforms}
-do
-    echo; echo "Uploading avm-${platform}-${change}.cov ..."
-    . ${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $buildsdir/${change}-${changeid}/$platform/avm.cov ${scp_coverage}/latest/avm-${platform}-${change}.cov
-done
-echo; echo "Uploading avm-${change}.cov ..."
-. ${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $buildsdir/${change}-${changeid}/coverage/avm.cov ${scp_coverage}/latest/avm-${change}.cov
-
-echo; echo "Updating code coverage reports..."
-covdatadir=$buildsdir/${change}-${changeid}/coverage
-# set pwd to code root for covfn to produce correct relative path
-cd $basedir
-
-# download current historical files
-${basedir}/build/buildbot/slaves/all/util-download.sh $http_coverage/codecoverage-fn-summary.csv $covdatadir/codecoverage-fn-summary.csv
-${basedir}/build/buildbot/slaves/all/util-download.sh $http_coverage/codecoverage-fnpercent-summary.csv $covdatadir/codecoverage-fnpercent-summary.csv
-${basedir}/build/buildbot/slaves/all/util-download.sh $http_coverage/codecoverage-bc-summary.csv $covdatadir/codecoverage-bc-summary.csv
-${basedir}/build/buildbot/slaves/all/util-download.sh $http_coverage/codecoverage-bcpercent-summary.csv $covdatadir/codecoverage-bcpercent-summary.csv
-
-# parse code coverage data and generate csv reports
-${basedir}/build/buildbot/slaves/all/util-parse-codecoverage.py --covfile=$covdatadir/avm.cov --build=$change --skips=$coverage_skips --datadir=$covdatadir
-result=$?
-test "$result" = "0" || {
-    echo "message: error ${basedir}/build/buildbot/slaves/all/util-parse-codecoverage.py failed"
-    exit 1
-}
-
-# upload csv reports
-${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage-fn-summary.csv ${scp_coverage}/codecoverage-fn-summary.csv
-${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage-fnpercent-summary.csv ${scp_coverage}/codecoverage-fnpercent-summary.csv
-${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage-bc-summary.csv ${scp_coverage}/codecoverage-bc-summary.csv
-${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage-bcpercent-summary.csv ${scp_coverage}/codecoverage-bcpercent-summary.csv
-${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage-fn-summary.csv ${scp_coverage}/codecoverage-fn-summary.csv
-${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage-info.csv ${scp_coverage}/codecoverage-info.csv
-${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage-summary.csv ${scp_coverage}/codecoverage-summary.csv
-${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage-missingfn.csv ${scp_coverage}/latest/codecoverage-missingfn.csv
-${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage.csv ${scp_coverage}/latest/codecoverage.csv
deleted file mode 100755
--- a/build/buildbot/slaves/mac-deep/scripts/coverage-run-acceptance-debug-debugger.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2010
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-##
-# Download the latest asc.jar if it does not exist
-##
-if [ ! -e "$basedir/utils/asc.jar" ]; then
-    echo "Download asc.jar"
-    ../all/util-download.sh $ascbuilds/asc.jar $basedir/utils/asc.jar
-    ret=$?
-    test "$ret" = "0" || {
-        echo "Downloading of asc.jar failed"
-        rm -f $basedir/utils/asc.jar
-        exit 1
-    }
-fi
-
-echo ""
-echo "Missing media will be compiled using the following ASC version:"
-echo "`java -jar $basedir/utils/asc.jar`"
-echo ""
-
-
-
-export ASC=$basedir/utils/asc.jar
-export BUILTINABC=$basedir/core/$builtinABC
-export SHELLABC=$basedir/shell/$shellABC
-export AVM=$buildsdir/${change}-${changeid}/${platform}/${shell_debug_debugger_cov}
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/debug_debugger.cov
-
-echo AVM=$AVM
-test -f $AVM || {
-  echo "ERROR: $AVM not found"
-  exit 1
-}
-
-echo AVM=$AVM
-echo "`$AVM`"
-echo; echo "AVM built with the following options:"
-echo "`$AVM -Dversion`"
-
-
-##
-# Ensure that the system is clean and ready
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-clean.sh
-
-cd ${basedir}/test/acceptance
-
-# If available, use windows python (instead of cygwin python)
-# Threading only works with windows python, $PYTHONWIN env variable must point to windows install
-# $PYTHONWIN must be defined with forward slashes, e.g: c:/Python26/python.exe
-if [ -z "$PYTHONWIN" ]
-then
-    py=python
-else
-    py=$PYTHONWIN
-fi
-
-echo "message: $py ./runtests.py --config=x86-lnx-tvm-cov-debugdebugger   --notimecheck"
-$py ./runtests.py --config=x86-lnx-tvm-cov-debugdebugger   --notimecheck
-$bullseyedir/covdir -q
-
-##
-# Ensure that the system is torn down and clean
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-teardown.sh
deleted file mode 100755
--- a/build/buildbot/slaves/mac-deep/scripts/coverage-run-acceptance-debug.sh
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2010
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-##
-# Download the latest asc.jar if it does not exist
-##
-if [ ! -e "$basedir/utils/asc.jar" ]; then
-    echo "Download asc.jar"
-    ../all/util-download.sh $ascbuilds/asc.jar $basedir/utils/asc.jar
-    ret=$?
-    test "$ret" = "0" || {
-        echo "Downloading of asc.jar failed"
-        rm -f $basedir/utils/asc.jar
-        exit 1
-    }
-fi
-
-echo ""
-echo "Missing media will be compiled using the following ASC version:"
-echo "`java -jar $basedir/utils/asc.jar`"
-echo ""
-
-
-
-export ASC=$basedir/utils/asc.jar
-export BUILTINABC=$basedir/core/$builtinABC
-export SHELLABC=$basedir/shell/$shellABC
-export AVM=$buildsdir/${change}-${changeid}/${platform}/${shell_debug_cov}
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/debug.cov
-
-echo AVM=$AVM
-test -f $AVM || {
-  echo "ERROR: $AVM not found"
-  exit 1
-}
-
-echo AVM=$AVM
-echo "`$AVM`"
-echo; echo "AVM built with the following options:"
-echo "`$AVM -Dversion`"
-
-
-##
-# Ensure that the system is clean and ready
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-clean.sh
-
-cd ${basedir}/test/acceptance
-
-# If available, use windows python (instead of cygwin python)
-# Threading only works with windows python, $PYTHONWIN env variable must point to windows install
-# $PYTHONWIN must be defined with forward slashes, e.g: c:/Python26/python.exe
-if [ -z "$PYTHONWIN" ]
-then
-    py=python
-else
-    py=$PYTHONWIN
-fi
-
-
-echo "message: $py ./runtests.py --config=x86-lnx-tvm-cov-debug   --notimecheck"
-$py ./runtests.py --config=x86-lnx-tvm-cov-debug   --notimecheck
-$bullseyedir/covdir -q
-
-##
-# Ensure that the system is torn down and clean
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-teardown.sh
-
deleted file mode 100755
--- a/build/buildbot/slaves/mac-deep/scripts/coverage-run-acceptance-release-debugger.sh
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2009-2010
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-##
-# Download the latest asc.jar if it does not exist
-##
-if [ ! -e "$basedir/utils/asc.jar" ]; then
-    echo "Download asc.jar"
-    ../all/util-download.sh $ascbuilds/asc.jar $basedir/utils/asc.jar
-    ret=$?
-    test "$ret" = "0" || {
-        echo "Downloading of asc.jar failed"
-        rm -f $basedir/utils/asc.jar
-        exit 1
-    }
-fi
-
-echo ""
-echo "Missing media will be compiled using the following ASC version:"
-echo "`java -jar $basedir/utils/asc.jar`"
-echo ""
-
-
-
-export ASC=$basedir/utils/asc.jar
-export BUILTINABC=$basedir/core/$builtinABC
-export SHELLABC=$basedir/shell/$shellABC
-export AVM=$buildsdir/${change}-${changeid}/${platform}/${shell_release_debugger_cov}
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/release_debugger.cov
-
-echo AVM=$AVM
-test -f $AVM || {
-  echo "ERROR: $AVM not found"
-  exit 1
-}
-
-echo AVM=$AVM
-echo "`$AVM`"
-echo; echo "AVM built with the following options:"
-echo "`$AVM -Dversion`"
-
-
-##
-# Ensure that the system is clean and ready
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-clean.sh
-
-cd ${basedir}/test/acceptance
-
-# If available, use windows python (instead of cygwin python)
-# Threading only works with windows python, $PYTHONWIN env variable must point to windows install
-# $PYTHONWIN must be defined with forward slashes, e.g: c:/Python26/python.exe
-if [ -z "$PYTHONWIN" ]
-then
-    py=python
-else
-    py=$PYTHONWIN
-fi
-
-
-echo "message: $py ./runtests.py --config=x86-lnx-tvm-cov-releasedebugger   --notimecheck"
-$py ./runtests.py --config=x86-lnx-tvm-cov-releasedebugger   --notimecheck
-$bullseyedir/covdir -q
-
-##
-# Ensure that the system is torn down and clean
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-teardown.sh
deleted file mode 100755
--- a/build/buildbot/slaves/mac-deep/scripts/coverage-run-acceptance-release-interp.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2010
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-##
-# Download the latest asc.jar if it does not exist
-##
-if [ ! -e "$basedir/utils/asc.jar" ]; then
-    echo "Download asc.jar"
-    ../all/util-download.sh $ascbuilds/asc.jar $basedir/utils/asc.jar
-    ret=$?
-    test "$ret" = "0" || {
-        echo "Downloading of asc.jar failed"
-        rm -f $basedir/utils/asc.jar
-        exit 1
-    }
-fi
-
-echo ""
-echo "Missing media will be compiled using the following ASC version:"
-echo "`java -jar $basedir/utils/asc.jar`"
-echo ""
-
-
-
-export ASC=$basedir/utils/asc.jar
-export BUILTINABC=$basedir/core/$builtinABC
-export SHELLABC=$basedir/shell/$shellABC
-export AVM=$buildsdir/${change}-${changeid}/${platform}/${shell_release_cov}
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/release.cov
-
-echo AVM=$AVM
-test -f $AVM || {
-  echo "ERROR: $AVM not found"
-  exit 1
-}
-
-echo AVM=$AVM
-echo "`$AVM`"
-echo; echo "AVM built with the following options:"
-echo "`$AVM -Dversion`"
-
-
-##
-# Ensure that the system is clean and ready
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-clean.sh
-
-cd ${basedir}/test/acceptance
-
-# If available, use windows python (instead of cygwin python)
-# Threading only works with windows python, $PYTHONWIN env variable must point to windows install
-# $PYTHONWIN must be defined with forward slashes, e.g: c:/Python26/python.exe
-if [ -z "$PYTHONWIN" ]
-then
-    py=python
-else
-    py=$PYTHONWIN
-fi
-
-echo "message: $py ./runtests.py --config=x86-lnx-tvm-cov-release-Dinterp   --notimecheck"
-$py ./runtests.py --config=x86-lnx-tvm-cov-release-Dinterp --vmargs=${interp}   --notimecheck
-$bullseyedir/covdir -q
-
-##
-# Ensure that the system is torn down and clean
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-teardown.sh
deleted file mode 100755
--- a/build/buildbot/slaves/mac-deep/scripts/coverage-run-acceptance-release-jit.sh
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2010
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-##
-# Download the latest asc.jar if it does not exist
-##
-if [ ! -e "$basedir/utils/asc.jar" ]; then
-    echo "Download asc.jar"
-    ../all/util-download.sh $ascbuilds/asc.jar $basedir/utils/asc.jar
-    ret=$?
-    test "$ret" = "0" || {
-        echo "Downloading of asc.jar failed"
-        rm -f $basedir/utils/asc.jar
-        exit 1
-    }
-fi
-
-echo ""
-echo "Missing media will be compiled using the following ASC version:"
-echo "`java -jar $basedir/utils/asc.jar`"
-echo ""
-
-
-
-export ASC=$basedir/utils/asc.jar
-export BUILTINABC=$basedir/core/$builtinABC
-export SHELLABC=$basedir/shell/$shellABC
-export AVM=$buildsdir/${change}-${changeid}/${platform}/${shell_release_cov}
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/release.cov
-
-echo AVM=$AVM
-test -f $AVM || {
-  echo "ERROR: $AVM not found"
-  exit 1
-}
-
-echo AVM=$AVM
-echo "`$AVM`"
-echo; echo "AVM built with the following options:"
-echo "`$AVM -Dversion`"
-
-
-##
-# Ensure that the system is clean and ready
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-clean.sh
-
-cd ${basedir}/test/acceptance
-
-# If available, use windows python (instead of cygwin python)
-# Threading only works with windows python, $PYTHONWIN env variable must point to windows install
-# $PYTHONWIN must be defined with forward slashes, e.g: c:/Python26/python.exe
-if [ -z "$PYTHONWIN" ]
-then
-    py=python
-else
-    py=$PYTHONWIN
-fi
-
-
-echo "message: $py ./runtests.py --config=x86-lnx-tvm-cov-release-Ojit   --notimecheck"
-$py ./runtests.py --config=x86-lnx-tvm-cov-release-Ojit --vmargs=${jit}   --notimecheck
-$bullseyedir/covdir -q
-
-##
-# Ensure that the system is torn down and clean
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-teardown.sh
deleted file mode 100755
--- a/build/buildbot/slaves/mac-deep/scripts/coverage-run-acceptance-release.sh
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2010
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-##
-# Download the latest asc.jar if it does not exist
-##
-if [ ! -e "$basedir/utils/asc.jar" ]; then
-    echo "Download asc.jar"
-    ../all/util-download.sh $ascbuilds/asc.jar $basedir/utils/asc.jar
-    ret=$?
-    test "$ret" = "0" || {
-        echo "Downloading of asc.jar failed"
-        rm -f $basedir/utils/asc.jar
-        exit 1
-    }
-fi
-
-echo ""
-echo "Missing media will be compiled using the following ASC version:"
-echo "`java -jar $basedir/utils/asc.jar`"
-echo ""
-
-
-
-export ASC=$basedir/utils/asc.jar
-export BUILTINABC=$basedir/core/$builtinABC
-export SHELLABC=$basedir/shell/$shellABC
-export AVM=$buildsdir/${change}-${changeid}/${platform}/${shell_release_cov}
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/release.cov
-
-echo AVM=$AVM
-test -f $AVM || {
-  echo "ERROR: $AVM not found"
-  exit 1
-}
-
-echo AVM=$AVM
-echo "`$AVM`"
-echo; echo "AVM built with the following options:"
-echo "`$AVM -Dversion`"
-
-
-##
-# Ensure that the system is clean and ready
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-clean.sh
-
-cd ${basedir}/test/acceptance
-
-# If available, use windows python (instead of cygwin python)
-# Threading only works with windows python, $PYTHONWIN env variable must point to windows install
-# $PYTHONWIN must be defined with forward slashes, e.g: c:/Python26/python.exe
-if [ -z "$PYTHONWIN" ]
-then
-    py=python
-else
-    py=$PYTHONWIN
-fi
-
-
-echo "message: $py ./runtests.py --config=x86-lnx-tvm-cov-release --notimecheck"
-$py ./runtests.py --config=x86-lnx-tvm-cov-release --notimecheck
-$bullseyedir/covdir -q
-
-##
-# Ensure that the system is torn down and clean
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-teardown.sh
deleted file mode 100755
--- a/build/buildbot/slaves/mac-deep/scripts/coverage-run-selftest.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2010
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-export AVM=$buildsdir/${change}-${changeid}/${platform}/${shell_release_cov}
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/release.cov
-
-
-##
-# Ensure that the system is clean and ready
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-clean.sh
-
-$AVM -Dselftest
-$bullseyedir/covdir -q
-
-##
-# Ensure that the system is torn down and clean
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-teardown.sh
new file mode 100644
--- /dev/null
+++ b/build/buildbot/slaves/mac-deep/scripts/env32
@@ -0,0 +1,3 @@
+# CONFIGURE_ARGS are appeneded to the arguments passed to configure.py
+CONFIGURE_ARGS=--mac-sdk=104u
+
new file mode 100644
--- /dev/null
+++ b/build/buildbot/slaves/mac-deep/scripts/env64
@@ -0,0 +1,3 @@
+# CONFIGURE_ARGS are appeneded to the arguments passed to configure.py
+CONFIGURE_ARGS=--target=x86_64-darwin --mac-sdk=105
+
deleted file mode 100755
--- a/build/buildbot/slaves/mac-deep/scripts/run-code-coverage.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2010
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-set -x  # activate debugging
-../all/build-builtinabc.sh $change:$changeid
-./coverage-build-release.sh $change:$changeid
-./coverage-build-debug.sh $change:$changeid
-./coverage-build-release-debugger.sh $change:$changeid
-./coverage-build-debug-debugger.sh $change:$changeid
-
-
-./coverage-build-check.sh $change:$changeid
-res=$?
-test "$res" = "0" || {
-    echo "Build check failed"
-    exit 1
-}
-
-../all/download-acceptance-tests.sh $change:$changeid
-./coverage-run-selftest.sh $change:$changeid
-./coverage-run-acceptance-release.sh $change:$changeid
-./coverage-run-acceptance-release-interp.sh $change:$changeid
-./coverage-run-acceptance-release-jit.sh $change:$changeid
-./coverage-run-acceptance-release-debugger.sh $change:$changeid
-./coverage-run-acceptance-debug.sh $change:$changeid
-./coverage-run-acceptance-debug-debugger.sh $change:$changeid
-
-./coverage-process.sh $change:$changeid
\ No newline at end of file
deleted file mode 100755
--- a/build/buildbot/slaves/windows-deep/scripts/coverage-build-check.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2009
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-
-# Release
-test -f $buildsdir/$change-${changeid}/$platform/$shell_release_cov || {
-  echo "message: Release Failed"
-  fail=1
-}
-
-# Release_Debugger
-test -f $buildsdir/$change-${changeid}/$platform/$shell_release_debugger_cov || {
-  echo "message: Release_Debugger Failed"
-  fail=1
-}
-
-# Debug
-test -f $buildsdir/$change-${changeid}/$platform/$shell_debug_cov || {
-  echo "message: Debug Failed"
-  fail=1
-}
-
-#Debug_Debugger
-test -f $buildsdir/$change-${changeid}/$platform/$shell_debug_debugger_cov || {
-  echo "message: Debug_Debugger Failed"
-  fail=1
-}
-
-
-if test "${fail}" = 1; then
-   echo Failing the build
-   exit 1
-fi
-
-
-
deleted file mode 100755
--- a/build/buildbot/slaves/windows-deep/scripts/coverage-build-debug-debugger.sh
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2009
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-
-##
-# Update the version string
-##
-. ../all/util-update-version.sh
-
-
-# Need to have bullseye at the start of the PATH
-export PREPATH=$bullseyedir
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/debug_debugger.cov
-# MUST set COVSRCDIR otherwise some file will be relative and other absolute
-# Seems like cpp files are relative and header files are absolute, this was
-# causing some problems with viewing coverage based on directory, since there
-# would be 2 directories, one relative and one absolute
-# Actually need to have it relative so that we can merge from multiple machines
-#export COVSRCDIR=
-
-# Make sure that the directory structure is created, bullseye will fail otherwise
-mkdir -p $buildsdir/${change}-${changeid}/$platform
-
-# Remove the generated coverage file if it already exists
-test -f $COVFILE && rm -f $COVFILE
-
-# Turn on bullseye code coverage
-$bullseyedir/cov01 --on
-
-##
-# Execute the common build script.
-# Just need to pass in a dummy additional args string ($2) and then the 
-# name of the executable that we want ($3)
-##
-cd $basedir/build/buildbot/slaves/scripts/
-../all/compile-generic.sh $change "--enable-shell --enable-debug --enable-debugger" ${build_shell_debug_debugger_cov}
-
-
-
deleted file mode 100755
--- a/build/buildbot/slaves/windows-deep/scripts/coverage-build-debug.sh
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2009
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-
-##
-# Update the version string
-##
-. ../all/util-update-version.sh
-
-
-# Need to have bullseye at the start of the PATH
-export PREPATH=$bullseyedir
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/debug.cov
-# MUST set COVSRCDIR otherwise some file will be relative and other absolute
-# Seems like cpp files are relative and header files are absolute, this was
-# causing some problems with viewing coverage based on directory, since there
-# would be 2 directories, one relative and one absolute
-# Actually need to have it relative so that we can merge from multiple machines
-#export COVSRCDIR=
-
-# Make sure that the directory structure is created, bullseye will fail otherwise
-mkdir -p $buildsdir/${change}-${changeid}/$platform
-
-# Remove the generated coverage file if it already exists
-test -f $COVFILE && rm -f $COVFILE
-
-# Turn on bullseye code coverage
-$bullseyedir/cov01 --on
-
-##
-# Execute the common build script.
-# Just need to pass in a dummy additional args string ($2) and then the 
-# name of the executable that we want ($3)
-##
-cd $basedir/build/buildbot/slaves/scripts/
-../all/compile-generic.sh $change "--enable-shell --enable-debug" ${build_shell_debug_cov}
-
-
-
deleted file mode 100755
--- a/build/buildbot/slaves/windows-deep/scripts/coverage-build-release-debugger.sh
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2009
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-
-##
-# Update the version string
-##
-. ../all/util-update-version.sh
-
-
-# Need to have bullseye at the start of the PATH
-export PREPATH=$bullseyedir
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/release_debugger.cov
-# MUST set COVSRCDIR otherwise some file will be relative and other absolute
-# Seems like cpp files are relative and header files are absolute, this was
-# causing some problems with viewing coverage based on directory, since there
-# would be 2 directories, one relative and one absolute
-# Actually need to have it relative so that we can merge from multiple machines
-#export COVSRCDIR=
-
-# Make sure that the directory structure is created, bullseye will fail otherwise
-mkdir -p $buildsdir/${change}-${changeid}/$platform
-
-# Remove the generated coverage file if it already exists
-test -f $COVFILE && rm -f $COVFILE
-
-# Turn on bullseye code coverage
-$bullseyedir/cov01 --on
-
-##
-# Execute the common build script.
-# Just need to pass in a dummy additional args string ($2) and then the 
-# name of the executable that we want ($3)
-##
-cd $basedir/build/buildbot/slaves/scripts/
-../all/compile-generic.sh $change "--enable-shell --enable-debugger" ${build_shell_release_debugger_cov}
-
-
-
deleted file mode 100755
--- a/build/buildbot/slaves/windows-deep/scripts/coverage-build-release.sh
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2009
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-
-##
-# Update the version string
-##
-. ../all/util-update-version.sh
-
-
-# Need to have bullseye at the start of the PATH
-export PREPATH=$bullseyedir
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/release.cov
-# MUST set COVSRCDIR otherwise some file will be relative and other absolute
-# Seems like cpp files are relative and header files are absolute, this was
-# causing some problems with viewing coverage based on directory, since there
-# would be 2 directories, one relative and one absolute
-# Actually need to have it relative so that we can merge from multiple machines
-#export COVSRCDIR=
-
-# Make sure that the directory structure is created, bullseye will fail otherwise
-mkdir -p $buildsdir/${change}-${changeid}/$platform
-
-# Remove the generated coverage file if it already exists
-test -f $COVFILE && rm -f $COVFILE
-
-# Turn on bullseye code coverage
-$bullseyedir/cov01 --on
-
-##
-# Execute the common build script.
-# Just need to pass in a dummy additional args string ($2) and then the 
-# name of the executable that we want ($3)
-##
-cd $basedir/build/buildbot/slaves/scripts/
-../all/compile-generic.sh $change "--enable-shell" ${build_shell_release_cov}
-
-
-
deleted file mode 100755
--- a/build/buildbot/slaves/windows-deep/scripts/coverage-process.sh
+++ /dev/null
@@ -1,161 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2009
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/avm.cov
-test -f $COVFILE && rm -f $COVFILE
-
-cd $buildsdir/${change}-${changeid}/$platform/
-files=`ls *.cov`
-
-$bullseyedir/covmerge -c $files
-
-cd ${basedir}
-$bullseyedir/covdir -q -m
-fnpct=`$bullseyedir/covdir -q -m | grep Total | awk '{print $6}'`
-cdpct=`$bullseyedir/covdir -q -m | grep Total | awk '{print $11}'`
-
-
-
-echo "message: total function coverage:           $fnpct"
-echo "message: total condition/decision coverage: $cdpct"
-
-. ${basedir}/build/buildbot/slaves/all/util-upload-ftp-asteam.sh $COVFILE $ftp_asteam/$branch/${change}-${changeid}/$platform/avm.cov
-
-echo "url: http://10.60.48.47/builds/$branch/${change}-${changeid}/${platform}/avm.cov code coverage data file avm.cov"
-
-
-# Current known platforms generating coverage data:
-platforms="windows mac linux"
-covfiles="" # this will get built up by looping over the platforms
-
-# Get the coverage files for all platforms. If all files are not avaible, stop.
-# Only continue processing if ALL platforms are complete.
-for platform in ${platforms}
-do
-    covfiles+="$platform/avm.cov "
-    if [ ! -e "$buildsdir/${change}-${changeid}/$platform/avm.cov" ]; then
-	echo "Downloading $platform/avm.cov"
-	${basedir}/build/buildbot/slaves/all/util-download.sh $vmbuilds$branch/${change}-${changeid}/$platform/avm.cov $buildsdir/${change}-${changeid}/$platform/avm.cov
-	ret=$?
-	test "$ret" = "0" || {
-            echo "Downloading of $platform/avm.cov failed"
-            rm -f $buildsdir/${change}-${changeid}/$platform/avm.cov
-	    echo "Not all coverage files are available so stop processing"
-            exit 0
-	}
-    fi
-done
-
-# Merge all coverage files into a single file and upload
-mkdir $buildsdir/${change}-${changeid}/coverage
-export COVFILE=$buildsdir/${change}-${changeid}/coverage/avm.cov
-test -f $COVFILE && rm -f $COVFILE
-
-echo $covfiles
-cd $buildsdir/${change}-${changeid}
-$bullseyedir/covmerge -c $covfiles
-
-cd ${basedir}
-$bullseyedir/covdir -q -m
-fnpct=`$bullseyedir/covdir -q -m | grep Total | awk '{print $6}'`
-cdpct=`$bullseyedir/covdir -q -m | grep Total | awk '{print $11}'`
-
-
-
-echo "message: combined total function coverage:           $fnpct"
-echo "message: combined total condition/decision coverage: $cdpct"
-
-. ${basedir}/build/buildbot/slaves/all/util-upload-ftp-asteam.sh $COVFILE $ftp_asteam/$branch/${change}-${changeid}/coverage/avm.cov
-echo "url: http://10.60.48.47/builds/$branch/${change}-${changeid}/coverage/avm.cov combined code coverage data file avm.cov"
-
-# Remove current coverage files
-ssh ${coverage_host} "cd ${coverage_dir}/latest; rm *.cov"
-
-# Post all of the coverage files to the 'latest' directory
-for platform in ${platforms}
-do
-    echo; echo "Uploading avm-${platform}-${change}.cov ..."
-    . ${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $buildsdir/${change}-${changeid}/$platform/avm.cov ${scp_coverage}/latest/avm-${platform}-${change}.cov
-done
-echo; echo "Uploading avm-${change}.cov ..."
-. ${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $buildsdir/${change}-${changeid}/coverage/avm.cov ${scp_coverage}/latest/avm-${change}.cov
-
-
-echo; echo "Updating code coverage reports..."
-covdatadir=$buildsdir/${change}-${changeid}/coverage
-# set pwd to code root for covfn to produce correct relative path
-cd $basedir
-
-# download current historical files
-${basedir}/build/buildbot/slaves/all/util-download.sh $http_coverage/codecoverage-fn-summary.csv $covdatadir/codecoverage-fn-summary.csv
-${basedir}/build/buildbot/slaves/all/util-download.sh $http_coverage/codecoverage-fnpercent-summary.csv $covdatadir/codecoverage-fnpercent-summary.csv
-${basedir}/build/buildbot/slaves/all/util-download.sh $http_coverage/codecoverage-bc-summary.csv $covdatadir/codecoverage-bc-summary.csv
-${basedir}/build/buildbot/slaves/all/util-download.sh $http_coverage/codecoverage-bcpercent-summary.csv $covdatadir/codecoverage-bcpercent-summary.csv
-
-# parse code coverage data and generate csv reports
-${basedir}/build/buildbot/slaves/all/util-parse-codecoverage.py --covfile=$covdatadir/avm.cov --build=$change --skips=$coverage_skips --datadir=$covdatadir
-result=$?
-test "$result" = "0" || {
-    echo "message: error ${basedir}/build/buildbot/slaves/all/util-parse-codecoverage.py failed"
-    exit 1
-}
-
-# upload csv reports
-${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage-fn-summary.csv ${scp_coverage}/codecoverage-fn-summary.csv
-${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage-fnpercent-summary.csv ${scp_coverage}/codecoverage-fnpercent-summary.csv
-${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage-bc-summary.csv ${scp_coverage}/codecoverage-bc-summary.csv
-${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage-bcpercent-summary.csv ${scp_coverage}/codecoverage-bcpercent-summary.csv
-${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage-fn-summary.csv ${scp_coverage}/codecoverage-fn-summary.csv
-${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage-info.csv ${scp_coverage}/codecoverage-info.csv
-${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage-summary.csv ${scp_coverage}/codecoverage-summary.csv
-${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage-missingfn.csv ${scp_coverage}/latest/codecoverage-missingfn.csv
-${basedir}/build/buildbot/slaves/all/util-upload-scp-mozilla.sh $covdatadir/codecoverage.csv ${scp_coverage}/latest/codecoverage.csv
deleted file mode 100755
--- a/build/buildbot/slaves/windows-deep/scripts/coverage-run-acceptance-debug-debugger.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2009
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-##
-# Download the latest asc.jar if it does not exist
-##
-if [ ! -e "$basedir/utils/asc.jar" ]; then
-    echo "Download asc.jar"
-    ../all/util-download.sh $ascbuilds/asc.jar $basedir/utils/asc.jar
-    ret=$?
-    test "$ret" = "0" || {
-        echo "Downloading of asc.jar failed"
-        rm -f $basedir/utils/asc.jar
-        exit 1
-    }
-fi
-
-echo ""
-echo "Missing media will be compiled using the following ASC version:"
-echo "`java -jar $basedir/utils/asc.jar`"
-echo ""
-
-
-
-export ASC=$basedir/utils/asc.jar
-export BUILTINABC=$basedir/core/$builtinABC
-export SHELLABC=$basedir/shell/$shellABC
-export AVM=$buildsdir/${change}-${changeid}/${platform}/${shell_debug_debugger_cov}
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/debug_debugger.cov
-
-echo AVM=$AVM
-test -f $AVM || {
-  echo "ERROR: $AVM not found"
-  exit 1
-}
-
-echo AVM=$AVM
-echo "`$AVM`"
-echo; echo "AVM built with the following options:"
-echo "`$AVM -Dversion`"
-
-
-##
-# Ensure that the system is clean and ready
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-clean.sh
-
-cd ${basedir}/test/acceptance
-
-# If available, use windows python (instead of cygwin python)
-# Threading only works with windows python, $PYTHONWIN env variable must point to windows install
-# $PYTHONWIN must be defined with forward slashes, e.g: c:/Python26/python.exe
-if [ -z "$PYTHONWIN" ]
-then
-    py=python
-else
-    py=$PYTHONWIN
-fi
-
-echo "message: $py ./runtests.py --config=x86-win-tvm-cov-debugdebugger   --notimecheck"
-$py ./runtests.py --config=x86-win-tvm-cov-debugdebugger   --notimecheck
-$bullseyedir/covdir -q
-
-##
-# Ensure that the system is torn down and clean
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-teardown.sh
deleted file mode 100755
--- a/build/buildbot/slaves/windows-deep/scripts/coverage-run-acceptance-debug.sh
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2009
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-##
-# Download the latest asc.jar if it does not exist
-##
-if [ ! -e "$basedir/utils/asc.jar" ]; then
-    echo "Download asc.jar"
-    ../all/util-download.sh $ascbuilds/asc.jar $basedir/utils/asc.jar
-    ret=$?
-    test "$ret" = "0" || {
-        echo "Downloading of asc.jar failed"
-        rm -f $basedir/utils/asc.jar
-        exit 1
-    }
-fi
-
-echo ""
-echo "Missing media will be compiled using the following ASC version:"
-echo "`java -jar $basedir/utils/asc.jar`"
-echo ""
-
-
-
-export ASC=$basedir/utils/asc.jar
-export BUILTINABC=$basedir/core/$builtinABC
-export SHELLABC=$basedir/shell/$shellABC
-export AVM=$buildsdir/${change}-${changeid}/${platform}/${shell_debug_cov}
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/debug.cov
-
-echo AVM=$AVM
-test -f $AVM || {
-  echo "ERROR: $AVM not found"
-  exit 1
-}
-
-echo AVM=$AVM
-echo "`$AVM`"
-echo; echo "AVM built with the following options:"
-echo "`$AVM -Dversion`"
-
-
-##
-# Ensure that the system is clean and ready
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-clean.sh
-
-cd ${basedir}/test/acceptance
-
-# If available, use windows python (instead of cygwin python)
-# Threading only works with windows python, $PYTHONWIN env variable must point to windows install
-# $PYTHONWIN must be defined with forward slashes, e.g: c:/Python26/python.exe
-if [ -z "$PYTHONWIN" ]
-then
-    py=python
-else
-    py=$PYTHONWIN
-fi
-
-
-echo "message: $py ./runtests.py --config=x86-win-tvm-cov-debug   --notimecheck"
-$py ./runtests.py --config=x86-win-tvm-cov-debug   --notimecheck
-$bullseyedir/covdir -q
-
-##
-# Ensure that the system is torn down and clean
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-teardown.sh
-
deleted file mode 100755
--- a/build/buildbot/slaves/windows-deep/scripts/coverage-run-acceptance-release-debugger.sh
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2009
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-##
-# Download the latest asc.jar if it does not exist
-##
-if [ ! -e "$basedir/utils/asc.jar" ]; then
-    echo "Download asc.jar"
-    ../all/util-download.sh $ascbuilds/asc.jar $basedir/utils/asc.jar
-    ret=$?
-    test "$ret" = "0" || {
-        echo "Downloading of asc.jar failed"
-        rm -f $basedir/utils/asc.jar
-        exit 1
-    }
-fi
-
-echo ""
-echo "Missing media will be compiled using the following ASC version:"
-echo "`java -jar $basedir/utils/asc.jar`"
-echo ""
-
-
-
-export ASC=$basedir/utils/asc.jar
-export BUILTINABC=$basedir/core/$builtinABC
-export SHELLABC=$basedir/shell/$shellABC
-export AVM=$buildsdir/${change}-${changeid}/${platform}/${shell_release_debugger_cov}
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/release_debugger.cov
-
-echo AVM=$AVM
-test -f $AVM || {
-  echo "ERROR: $AVM not found"
-  exit 1
-}
-
-echo AVM=$AVM
-echo "`$AVM`"
-echo; echo "AVM built with the following options:"
-echo "`$AVM -Dversion`"
-
-
-##
-# Ensure that the system is clean and ready
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-clean.sh
-
-cd ${basedir}/test/acceptance
-
-# If available, use windows python (instead of cygwin python)
-# Threading only works with windows python, $PYTHONWIN env variable must point to windows install
-# $PYTHONWIN must be defined with forward slashes, e.g: c:/Python26/python.exe
-if [ -z "$PYTHONWIN" ]
-then
-    py=python
-else
-    py=$PYTHONWIN
-fi
-
-
-echo "message: $py ./runtests.py --config=x86-win-tvm-cov-releasedebugger   --notimecheck"
-$py ./runtests.py --config=x86-win-tvm-cov-releasedebugger   --notimecheck
-$bullseyedir/covdir -q
-
-##
-# Ensure that the system is torn down and clean
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-teardown.sh
deleted file mode 100755
--- a/build/buildbot/slaves/windows-deep/scripts/coverage-run-acceptance-release-interp.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2009
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-##
-# Download the latest asc.jar if it does not exist
-##
-if [ ! -e "$basedir/utils/asc.jar" ]; then
-    echo "Download asc.jar"
-    ../all/util-download.sh $ascbuilds/asc.jar $basedir/utils/asc.jar
-    ret=$?
-    test "$ret" = "0" || {
-        echo "Downloading of asc.jar failed"
-        rm -f $basedir/utils/asc.jar
-        exit 1
-    }
-fi
-
-echo ""
-echo "Missing media will be compiled using the following ASC version:"
-echo "`java -jar $basedir/utils/asc.jar`"
-echo ""
-
-
-
-export ASC=$basedir/utils/asc.jar
-export BUILTINABC=$basedir/core/$builtinABC
-export SHELLABC=$basedir/shell/$shellABC
-export AVM=$buildsdir/${change}-${changeid}/${platform}/${shell_release_cov}
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/release.cov
-
-echo AVM=$AVM
-test -f $AVM || {
-  echo "ERROR: $AVM not found"
-  exit 1
-}
-
-echo AVM=$AVM
-echo "`$AVM`"
-echo; echo "AVM built with the following options:"
-echo "`$AVM -Dversion`"
-
-
-##
-# Ensure that the system is clean and ready
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-clean.sh
-
-cd ${basedir}/test/acceptance
-
-# If available, use windows python (instead of cygwin python)
-# Threading only works with windows python, $PYTHONWIN env variable must point to windows install
-# $PYTHONWIN must be defined with forward slashes, e.g: c:/Python26/python.exe
-if [ -z "$PYTHONWIN" ]
-then
-    py=python
-else
-    py=$PYTHONWIN
-fi
-
-echo "message: $py ./runtests.py --config=x86-win-tvm-cov-release-Dinterp   --notimecheck"
-$py ./runtests.py --config=x86-win-tvm-cov-release-Dinterp --vmargs=${interp}   --notimecheck
-$bullseyedir/covdir -q
-
-##
-# Ensure that the system is torn down and clean
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-teardown.sh
deleted file mode 100755
--- a/build/buildbot/slaves/windows-deep/scripts/coverage-run-acceptance-release-jit.sh
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2009
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-##
-# Download the latest asc.jar if it does not exist
-##
-if [ ! -e "$basedir/utils/asc.jar" ]; then
-    echo "Download asc.jar"
-    ../all/util-download.sh $ascbuilds/asc.jar $basedir/utils/asc.jar
-    ret=$?
-    test "$ret" = "0" || {
-        echo "Downloading of asc.jar failed"
-        rm -f $basedir/utils/asc.jar
-        exit 1
-    }
-fi
-
-echo ""
-echo "Missing media will be compiled using the following ASC version:"
-echo "`java -jar $basedir/utils/asc.jar`"
-echo ""
-
-
-
-export ASC=$basedir/utils/asc.jar
-export BUILTINABC=$basedir/core/$builtinABC
-export SHELLABC=$basedir/shell/$shellABC
-export AVM=$buildsdir/${change}-${changeid}/${platform}/${shell_release_cov}
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/release.cov
-
-echo AVM=$AVM
-test -f $AVM || {
-  echo "ERROR: $AVM not found"
-  exit 1
-}
-
-echo AVM=$AVM
-echo "`$AVM`"
-echo; echo "AVM built with the following options:"
-echo "`$AVM -Dversion`"
-
-
-##
-# Ensure that the system is clean and ready
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-clean.sh
-
-cd ${basedir}/test/acceptance
-
-# If available, use windows python (instead of cygwin python)
-# Threading only works with windows python, $PYTHONWIN env variable must point to windows install
-# $PYTHONWIN must be defined with forward slashes, e.g: c:/Python26/python.exe
-if [ -z "$PYTHONWIN" ]
-then
-    py=python
-else
-    py=$PYTHONWIN
-fi
-
-
-echo "message: $py ./runtests.py --config=x86-win-tvm-cov-release-Ojit   --notimecheck"
-$py ./runtests.py --config=x86-win-tvm-cov-release-Ojit --vmargs=${jit}   --notimecheck
-$bullseyedir/covdir -q
-
-##
-# Ensure that the system is torn down and clean
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-teardown.sh
deleted file mode 100755
--- a/build/buildbot/slaves/windows-deep/scripts/coverage-run-acceptance-release.sh
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2009
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-##
-# Download the latest asc.jar if it does not exist
-##
-if [ ! -e "$basedir/utils/asc.jar" ]; then
-    echo "Download asc.jar"
-    ../all/util-download.sh $ascbuilds/asc.jar $basedir/utils/asc.jar
-    ret=$?
-    test "$ret" = "0" || {
-        echo "Downloading of asc.jar failed"
-        rm -f $basedir/utils/asc.jar
-        exit 1
-    }
-fi
-
-echo ""
-echo "Missing media will be compiled using the following ASC version:"
-echo "`java -jar $basedir/utils/asc.jar`"
-echo ""
-
-
-
-export ASC=$basedir/utils/asc.jar
-export BUILTINABC=$basedir/core/$builtinABC
-export SHELLABC=$basedir/shell/$shellABC
-export AVM=$buildsdir/${change}-${changeid}/${platform}/${shell_release_cov}
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/release.cov
-
-echo AVM=$AVM
-test -f $AVM || {
-  echo "ERROR: $AVM not found"
-  exit 1
-}
-
-echo AVM=$AVM
-echo "`$AVM`"
-echo; echo "AVM built with the following options:"
-echo "`$AVM -Dversion`"
-
-
-##
-# Ensure that the system is clean and ready
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-clean.sh
-
-cd ${basedir}/test/acceptance
-
-# If available, use windows python (instead of cygwin python)
-# Threading only works with windows python, $PYTHONWIN env variable must point to windows install
-# $PYTHONWIN must be defined with forward slashes, e.g: c:/Python26/python.exe
-if [ -z "$PYTHONWIN" ]
-then
-    py=python
-else
-    py=$PYTHONWIN
-fi
-
-
-echo "message: $py ./runtests.py --config=x86-win-tvm-cov-release   --notimecheck"
-$py ./runtests.py --config=x86-win-tvm-cov-release   --notimecheck
-$bullseyedir/covdir -q
-
-##
-# Ensure that the system is torn down and clean
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-teardown.sh
deleted file mode 100755
--- a/build/buildbot/slaves/windows-deep/scripts/coverage-run-selftest.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2009
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-
-export AVM=$buildsdir/${change}-${changeid}/${platform}/${shell_release_cov}
-export COVFILE=$buildsdir/${change}-${changeid}/$platform/selftest.cov
-
-
-##
-# Ensure that the system is clean and ready
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-clean.sh
-
-$AVM -Dselftest
-$bullseyedir/covdir -q
-
-##
-# Ensure that the system is torn down and clean
-##
-cd $basedir/build/buildbot/slaves/scripts
-../all/util-acceptance-teardown.sh
--- a/build/buildbot/slaves/windows-deep/scripts/environment.sh
+++ b/build/buildbot/slaves/windows-deep/scripts/environment.sh
@@ -56,17 +56,17 @@ export shell_debug_debugger_cov=avmshell
 
 export shell_release_vtune=avmshell_vtune.exe
 
 export build_shell_release_cov=avmshell_cov
 export build_shell_release_debugger_cov=avmshell_s_cov
 export build_shell_debug_cov=avmshell_d_cov
 export build_shell_debug_debugger_cov=avmshell_sd_cov
 
-bullseyedir="/c/Progra~1/BullseyeCoverage/bin"
+export bullseyedir="/c/Progra~1/BullseyeCoverage/bin"
 
 
 VS_HOME_PATH="/c/Program Files/Microsoft Visual Studio 9.0"
 VS_HOME="c:\Program Files\Microsoft Visual Studio 9.0"
 
 # ${PREPATH} if it exists will be the first thing in the path,
 # this is needed for code coverage.
 export PATH="${PREPATH}:$VS_HOME_PATH/Common7/IDE:$VS_HOME_PATH/VC/bin:$VS_HOME_PATH\Common7\Tools:$VS_HOME_PATH/VC/VCPackages:$PATH"
deleted file mode 100755
--- a/build/buildbot/slaves/windows-deep/scripts/run-code-coverage.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/bash
-#  ***** BEGIN LICENSE BLOCK *****
-#  Version: MPL 1.1/GPL 2.0/LGPL 2.1
-# 
-#  The contents of this file are subject to the Mozilla Public License Version
-#  1.1 (the "License"); you may not use this file except in compliance with
-#  the License. You may obtain a copy of the License at
-#  http://www.mozilla.org/MPL/
-# 
-#  Software distributed under the License is distributed on an "AS IS" basis,
-#  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-#  for the specific language governing rights and limitations under the
-#  License.
-# 
-#  The Original Code is [Open Source Virtual Machine.].
-# 
-#  The Initial Developer of the Original Code is
-#  Adobe System Incorporated.
-#  Portions created by the Initial Developer are Copyright (C) 2009
-#  the Initial Developer. All Rights Reserved.
-# 
-#  Contributor(s):
-#    Adobe AS3 Team
-# 
-#  Alternatively, the contents of this file may be used under the terms of
-#  either the GNU General Public License Version 2 or later (the "GPL"), or
-#  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-#  in which case the provisions of the GPL or the LGPL are applicable instead
-#  of those above. If you wish to allow use of your version of this file only
-#  under the terms of either the GPL or the LGPL, and not to allow others to
-#  use your version of this file under the terms of the MPL, indicate your
-#  decision by deleting the provisions above and replace them with the notice
-#  and other provisions required by the GPL or the LGPL. If you do not delete
-#  the provisions above, a recipient may use your version of this file under
-#  the terms of any one of the MPL, the GPL or the LGPL.
-# 
-#  ***** END LICENSE BLOCK ****
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed
-
-
-##
-# Bring in the environment variables
-##
-. ./environment.sh
-
-##
-# Calculate the change number and change id
-##
-. ../all/util-calculate-change.sh $1
-
-set -x	# activate debugging
-../all/build-builtinabc.sh $change:$changeid
-./coverage-build-release.sh $change:$changeid
-./coverage-build-debug.sh $change:$changeid
-./coverage-build-release-debugger.sh $change:$changeid
-./coverage-build-debug-debugger.sh $change:$changeid
-
-
-./coverage-build-check.sh $change:$changeid
-res=$?
-test "$res" = "0" || {
-    echo "Build check failed"
-    exit 1
-}
-
-../all/download-acceptance-tests.sh $change:$changeid
-./coverage-run-selftest.sh $change:$changeid
-./coverage-run-acceptance-release.sh $change:$changeid
-./coverage-run-acceptance-release-interp.sh $change:$changeid
-./coverage-run-acceptance-release-jit.sh $change:$changeid
-./coverage-run-acceptance-release-debugger.sh $change:$changeid
-./coverage-run-acceptance-debug.sh $change:$changeid
-./coverage-run-acceptance-debug-debugger.sh $change:$changeid
-
-./coverage-process.sh
\ No newline at end of file
new file mode 100644
--- /dev/null
+++ b/build/buildbot/slaves/windows64-deep/scripts/env32
@@ -0,0 +1,6 @@
+# CONFIGURE_ARGS are appeneded to the arguments passed to configure.py
+CONFIGURE_ARGS=
+PREPATH=/c/tools/BullseyeCoverage/bin:/c/Program Files (x86)/Microsoft Visual Studio 9.0/Common7/IDE:/c/Program Files (x86)/Microsoft Visual Studio 9.0/VC/bin:/c/Program Files (x86)/Microsoft Visual Studio 9.0/Common7/Tools:/c/Program Files (x86)/Microsoft Visual Studio 9.0/VC/VCPackages
+INCLUDE=C:\Program Files\Microsoft SDKs\Windows\v6.0\Include;c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\atlmfc\include;c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\include;
+LIB=C:\Program Files\Microsoft SDKs\Windows\v6.0\Lib;c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\atlmfc\lib;c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\lib;
+LIBPATH=C:\Program Files\Microsoft SDKs\Windows\v6.0\Lib;c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\atlmfc\lib;c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\lib;
new file mode 100644
--- /dev/null
+++ b/build/buildbot/slaves/windows64-deep/scripts/env64
@@ -0,0 +1,6 @@
+# CONFIGURE_ARGS are appeneded to the arguments passed to configure.py
+CONFIGURE_ARGS=--target=x86_64-win
+PREPATH=/c/tools/BullseyeCoverage/bin:/c/Program Files (x86)/Microsoft Visual Studio 9.0/Common7/IDE:/c/Program Files (x86)/Microsoft Visual Studio 9.0/VC/bin/amd64:/c/Program Files (x86)/Microsoft Visual Studio 9.0/Common7/Tools:/c/Program Files (x86)/Microsoft Visual Studio 9.0/VC/VCPackages
+INCLUDE=C:\Program Files\Microsoft SDKs\Windows\v6.0\Include;c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\atlmfc\include;c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\include;
+LIB=C:\Program Files\Microsoft SDKs\Windows\v6.0\Lib\x64;c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\atlmfc\lib\amd64;c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\lib\amd64;
+LIBPATH=C:\Program Files\Microsoft SDKs\Windows\v6.0\Lib\x64;c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\atlmfc\lib\amd64;c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\lib\amd64;
--- a/build/buildbot/slaves/windows64-deep/scripts/environment.sh
+++ b/build/buildbot/slaves/windows64-deep/scripts/environment.sh
@@ -53,18 +53,20 @@ export shell_release_32=${shell_release}
 export shell_release_64=${shell_release_64}
 
 export shell_release=${shell_release_64}
 export shell_release_wordcode=${shell_release_wordcode_64}
 export shell_debug=${shell_debug_64}
 export shell_release_debugger=${shell_release_debugger_64}
 export shell_debug_debugger=${shell_debug_debugger_64}
 
+export bullseyedir="c:/tools/BullseyeCoverage/bin"
+
 VS_HOME_PATH="/c/Program Files (x86)/Microsoft Visual Studio 9.0"
 VS_HOME="c:\Program Files (x86)\Microsoft Visual Studio 9.0"
 
-export PATH="$VS_HOME_PATH/Common7/IDE:$VS_HOME_PATH/VC/bin/amd64:$VS_HOME_PATH\Common7\Tools:$VS_HOME_PATH/VC/VCPackages:$PATH"
-export INCLUDE="C:\Program Files\Microsoft SDKs\Windows\v6.0\Include;$VS_HOME\VC\atlmfc\include;$VS_HOME\VC\include;"
-export LIB="C:\Program Files\Microsoft SDKs\Windows\v6.0\Lib\x64;$VS_HOME\VC\atlmfc\lib\amd64;$VS_HOME\VC\lib\amd64;"
-export LIBPATH="C:\Program Files\Microsoft SDKs\Windows\v6.0\Lib\x64;$VS_HOME\VC\atlmfc\lib\amd64;$VS_HOME\VC\lib\amd64;"
+export PATH="${PREPATH}:$VS_HOME_PATH/Common7/IDE:$VS_HOME_PATH/VC/bin/amd64:$VS_HOME_PATH\Common7\Tools:$VS_HOME_PATH/VC/VCPackages:$PATH"
+export INCLUDE="${INCLUDE};C:\Program Files\Microsoft SDKs\Windows\v6.0\Include;$VS_HOME\VC\atlmfc\include;$VS_HOME\VC\include;"
+export LIB="${LIB};C:\Program Files\Microsoft SDKs\Windows\v6.0\Lib\x64;$VS_HOME\VC\atlmfc\lib\amd64;$VS_HOME\VC\lib\amd64;"
+export LIBPATH="${LIBPATH};C:\Program Files\Microsoft SDKs\Windows\v6.0\Lib\x64;$VS_HOME\VC\atlmfc\lib\amd64;$VS_HOME\VC\lib\amd64;"
 
 ## Used by make in the build scripts
 export make_opt="-j2"