Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 23:35:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changesets 9485ee35cb1d, f2e2b775624f, and 5315d961f36e (bug 1255476) for breaking Windows SM jobs.

Browse Source 
CLOSED TREE
This commit is contained in:
Ryan VanderMeulen 2016-03-10 18:59:51 -05:00
parent ff98f6e2ee
commit 736cfda13e
17 changed files with 73 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
js/src/devtools/automation/autospider.sh
View File

@ -10,11 +10,9 @@ ABSDIR="$(cd $DIR; pwd)"
SOURCE="$(cd $DIR/../../../..; pwd)"
function usage() {
echo "Usage: $0 [--dep] [--test NAME] [--skip-test NAME] [--timeout SEC] <variant>"
echo "Usage: $0 [--dep] <variant>"
}
declare -a REQ_TESTS
clean=1
platform=""
# 3 hours. OS X doesn't support the "sleep 3h" syntax.
@ -35,16 +33,6 @@ while [ $# -gt 1 ]; do
TIMEOUT="$1"
shift
;;
--test)
shift
REQ_TESTS+=($1)
shift
;;
--skip-test)
shift
REQ_TESTS+=(skip-$1)
shift
;;
*)
echo "Invalid arguments" >&2
usage
@ -186,8 +174,9 @@ if type setarch >/dev/null 2>&1; then
COMMAND_PREFIX="setarch $(uname -m) -R "
fi
declare -A TESTS
TESTS=([check]=1 [jstest]=1 [jittest]=1 [jsapitest]=1 [gdb]=0)
RUN_JSTESTS=true
RUN_JITTEST=true
RUN_JSAPITESTS=true
PARENT=$$
@ -216,9 +205,8 @@ elif [[ "$VARIANT" = "compacting" ]]; then
export JSTESTS_EXTRA_ARGS="--exclude-file=$ABSDIR/cgc-jstests-slow.txt"
case "$platform" in
win*)
TESTS[jstest]=0
;;
win*)
RUN_JSTESTS=false
esac
elif [[ "$VARIANT" = "warnaserr" ||
"$VARIANT" = "warnaserrdebug" ||
@ -235,41 +223,18 @@ elif [[ "$VARIANT" = arm64* ]]; then
export JITTEST_EXTRA_ARGS="--jitflags=none --args=--baseline-eager -x ion/ -x asm.js/"
fi
# Override default test collection with command-line arguments, allowing 'all'
# (in either --test=all or --skip-test=all) to mean all known tests.
set +e
for arg in "${REQ_TESTS[@]}"; do
[[ $arg == skip-* ]]
select=$? # 0 means skip-TEST, 1 means TEST
if [[ ${arg#skip-} = all ]]; then
for t in "${!TESTS[@]}"; do
TESTS[$t]=$select
done
else
TESTS[$arg]=$select
fi
done
set -e
# Dump out the final set of tests
declare -p TESTS
$COMMAND_PREFIX $MAKE check || exit 1
RESULT=0
if [ ${TESTS[check]} = 1 ]; then
$COMMAND_PREFIX $MAKE check || RESULT=$?
fi
if [ ${TESTS[jittest]} = 1 ]; then
if $RUN_JITTEST; then
$COMMAND_PREFIX $MAKE check-jit-test || RESULT=$?
fi
if [ ${TESTS[jsapitest]} = 1 ]; then
if $RUN_JSAPITESTS; then
$COMMAND_PREFIX $OBJDIR/dist/bin/jsapi-tests || RESULT=$?
fi
if [ ${TESTS[jstest]} = 1 ]; then
if $RUN_JSTESTS; then
$COMMAND_PREFIX $MAKE check-jstests || RESULT=$?
fi
if [ ${TESTS[gdb]} = 1 ]; then
$COMMAND_PREFIX ${PYTHON:-python2.7} $SOURCE/js/src/gdb/run-tests.py $OBJDIR || RESULT=$?
fi
exit $RESULT

24
testing/taskcluster/scripts/builder/build-sm-gdb.sh
View File

@ -1,24 +0,0 @@
#!/bin/bash
# Run Spidermonkey's gdb integration tests
set -x
. $(dirname $0)/sm-setup.sh
: ${SPIDERMONKEY_VARIANT:=plaindebug}
cd $WORK
# Run the script
$SRCDIR/js/src/devtools/automation/autospider.sh --skip-test all --test gdb $SPIDERMONKEY_VARIANT
BUILD_STATUS=$?
# Ensure upload dir exists
mkdir -p $UPLOAD_DIR
# Copy artifacts for upload by TaskCluster
cp -rL $SRCDIR/obj-spider/dist/bin/{gdb-tests,gdb-tests-gdb.py,js-gdb.py} $UPLOAD_DIR
exit $BUILD_STATUS

50
testing/taskcluster/scripts/builder/build-sm.sh
View File

@ -2,12 +2,58 @@
set -x
. $(dirname $0)/sm-setup.sh
: ${TOOLTOOL_SERVER:=https://api.pub.build.mozilla.org/tooltool/}
: ${TOOLTOOL_REPO:=https://git.mozilla.org/build/tooltool.git}
: ${TOOLTOOL_REV:=master}
: ${SPIDERMONKEY_VARIANT:=plain}
: ${UPLOAD_DIR:=$HOME/artifacts/}
: ${WORK:=$HOME/workspace}
: ${SRCDIR:=$WORK/build/src}
cd $WORK
# Need to install things from tooltool. Figure out what platform to use.
case $(uname -m) in
i686 | arm )
BITS=32
;;
*)
BITS=64
;;
esac
case "$OSTYPE" in
darwin*)
PLATFORM_OS=macosx
;;
linux-gnu)
PLATFORM_OS=linux
;;
msys)
PLATFORM_OS=win
;;
*)
echo "Unrecognized OSTYPE '$OSTYPE'" >&2
PLATFORM_OS=linux
;;
esac
# Install everything needed for the browser on this platform. Not all of it is
# necessary for the JS shell, but it's less duplication to share tooltool
# manifests.
BROWSER_PLATFORM=$PLATFORM_OS$BITS
TOOLTOOL_MANIFEST="$SRCDIR/browser/config/tooltool-manifests/$BROWSER_PLATFORM/releng.manifest"
tc-vcs checkout $WORK/tooltool $TOOLTOOL_REPO $TOOLTOOL_REPO $TOOLTOOL_REV
(cd $WORK && python tooltool/tooltool.py --url $TOOLTOOL_SERVER -m $TOOLTOOL_MANIFEST fetch ${TOOLTOOL_CACHE:+ -c $TOOLTOOL_CACHE})
# Point to the appropriate compiler, assuming taskcluster will one day run on non-Linux OSes.
case "$PLATFORM_OS" in
linux) export PATH="$WORK/gcc/bin":$PATH ;;
macosx) export PATH="$WORK/clang/bin":$PATH ;;
esac
# Run the script
$SRCDIR/js/src/devtools/automation/autospider.sh $SPIDERMONKEY_VARIANT
BUILD_STATUS=$?

54
testing/taskcluster/scripts/builder/sm-setup.sh
View File

@ -1,54 +0,0 @@
#!/bin/bash
set -x
: ${TOOLTOOL_SERVER:=https://api.pub.build.mozilla.org/tooltool/}
: ${TOOLTOOL_REPO:=https://git.mozilla.org/build/tooltool.git}
: ${TOOLTOOL_REV:=master}
: ${UPLOAD_DIR:=$HOME/artifacts/}
: ${WORK:=$HOME/workspace}
: ${SRCDIR:=$WORK/build/src}
cd $WORK
# Need to install things from tooltool. Figure out what platform to use.
case $(uname -m) in
i686 | arm )
BITS=32
;;
*)
BITS=64
;;
esac
case "$OSTYPE" in
darwin*)
PLATFORM_OS=macosx
;;
linux-gnu)
PLATFORM_OS=linux
;;
msys)
PLATFORM_OS=win
;;
*)
echo "Unrecognized OSTYPE '$OSTYPE'" >&2
PLATFORM_OS=linux
;;
esac
# Install everything needed for the browser on this platform. Not all of it is
# necessary for the JS shell, but it's less duplication to share tooltool
# manifests.
BROWSER_PLATFORM=$PLATFORM_OS$BITS
TOOLTOOL_MANIFEST="$SRCDIR/browser/config/tooltool-manifests/$BROWSER_PLATFORM/releng.manifest"
tc-vcs checkout $WORK/tooltool $TOOLTOOL_REPO $TOOLTOOL_REPO $TOOLTOOL_REV
(cd $WORK && python tooltool/tooltool.py --url $TOOLTOOL_SERVER -m $TOOLTOOL_MANIFEST fetch ${TOOLTOOL_CACHE:+ -c $TOOLTOOL_CACHE})
# Point to the appropriate compiler, assuming taskcluster will one day run on non-Linux OSes.
case "$PLATFORM_OS" in
linux) export PATH="$WORK/gcc/bin":$PATH ;;
macosx) export PATH="$WORK/clang/bin":$PATH ;;
esac

6
testing/taskcluster/tasks/branches/try/job_flags.yml
View File

@ -135,12 +135,6 @@ builds:
task: tasks/builds/sm_warnaserr.yml
debug:
task: tasks/builds/sm_warnaserrdebug.yml
sm-gdb:
platforms:
- Linux64
types:
debug:
task: tasks/builds/sm_gdb.yml
post-build:
upload-symbols:

2
testing/taskcluster/tasks/builds/sm_arm_sim.yml
View File

@ -1,5 +1,5 @@
$inherits:
from: 'tasks/builds/sm_build_base.yml'
from: 'tasks/builds/sm_base.yml'
variables:
build_name: 'sm-arm-sim'
build_type: 'opt'

2
testing/taskcluster/tasks/builds/sm_arm_sim_osx.yml
View File

@ -1,5 +1,5 @@
$inherits:
from: 'tasks/builds/sm_build_base.yml'
from: 'tasks/builds/sm_base.yml'
variables:
build_name: 'sm-arm-sim-osx'
build_type: 'opt'

6
testing/taskcluster/tasks/builds/sm_base.yml
View File

@ -3,6 +3,10 @@ $inherits:
task:
workerType: spidermonkey
routes:
- 'index.buildbot.branches.{{project}}.sm-plain'
- 'index.buildbot.revisions.{{head_rev}}.{{project}}.sm-plain'
scopes:
- 'docker-worker:cache:tooltool-cache'
- 'docker-worker:cache:level-{{level}}-{{project}}-build-spidermonkey-workspace'
@ -19,6 +23,8 @@ task:
maxRunTime: 36000
command: ["/bin/bash", "-c", "cd /home/worker/ && ./bin/checkout-sources.sh && ./workspace/build/src/testing/taskcluster/scripts/builder/build-sm.sh" ]
extra:
treeherderEnv:
- staging

5
testing/taskcluster/tasks/builds/sm_build_base.yml
View File

@ -1,5 +0,0 @@
$inherits:
from: 'tasks/builds/sm_base.yml'
task:
payload:
command: ["/bin/bash", "-c", "cd /home/worker/ && ./bin/checkout-sources.sh && ./workspace/build/src/testing/taskcluster/scripts/builder/build-sm.sh" ]

2
testing/taskcluster/tasks/builds/sm_compacting.yml
View File

@ -1,5 +1,5 @@
$inherits:
from: 'tasks/builds/sm_build_base.yml'
from: 'tasks/builds/sm_base.yml'
variables:
build_name: 'sm-compacting'
build_type: 'opt'

17
testing/taskcluster/tasks/builds/sm_gdb.yml
View File

@ -1,17 +0,0 @@
$inherits:
from: 'tasks/builds/sm_base.yml'
variables:
build_name: 'sm-gdb'
build_type: 'debug'
task:
payload:
command: ["/bin/bash", "-c", "cd /home/worker/ && ./bin/checkout-sources.sh && ./workspace/build/src/testing/taskcluster/scripts/builder/build-sm-gdb.sh" ]
metadata:
name: '[TC] Spidermonkey GDB Tests'
description: 'Spidermonkey GDB Tests'
extra:
treeherder:
symbol: gdb
locations:
build: null
tests: null

2
testing/taskcluster/tasks/builds/sm_generational.yml
View File

@ -1,5 +1,5 @@
$inherits:
from: 'tasks/builds/sm_build_base.yml'
from: 'tasks/builds/sm_base.yml'
variables:
build_name: 'sm-generational'
build_type: 'opt'

2
testing/taskcluster/tasks/builds/sm_plain.yml
View File

@ -1,5 +1,5 @@
$inherits:
from: 'tasks/builds/sm_build_base.yml'
from: 'tasks/builds/sm_base.yml'
variables:
build_name: 'sm-plain'
build_type: 'opt'

2
testing/taskcluster/tasks/builds/sm_plaindebug.yml
View File

@ -1,5 +1,5 @@
$inherits:
from: 'tasks/builds/sm_build_base.yml'
from: 'tasks/builds/sm_base.yml'
variables:
build_name: 'sm-plaindebug'
build_type: 'debug'

2
testing/taskcluster/tasks/builds/sm_rootanalysis.yml
View File

@ -1,5 +1,5 @@
$inherits:
from: 'tasks/builds/sm_build_base.yml'
from: 'tasks/builds/sm_base.yml'
variables:
build_name: 'sm-rootanalysis'
build_type: 'opt'

2
testing/taskcluster/tasks/builds/sm_warnaserr.yml
View File

@ -1,5 +1,5 @@
$inherits:
from: 'tasks/builds/sm_build_base.yml'
from: 'tasks/builds/sm_base.yml'
variables:
build_name: 'sm-warnaserr'
build_type: 'opt'

2
testing/taskcluster/tasks/builds/sm_warnaserrdebug.yml
View File

@ -1,5 +1,5 @@
$inherits:
from: 'tasks/builds/sm_build_base.yml'
from: 'tasks/builds/sm_base.yml'
variables:
build_name: 'sm-warnaserrdebug'
build_type: 'debug'