Backed out changeset 5b48be011a93 (bug 1250709)
authorSteve Fink <sfink@mozilla.com>
Mon, 14 Mar 2016 21:58:25 -0700
changeset 288708 ab0ed243cb7fc03373718fd7538416a83ca65a55
parent 288707 e2b9894a48e58ac147c98dbb50d049cc403795be
child 288709 226d502010f605549f057297dd6b5596ee3cb829
push id18174
push usercbook@mozilla.com
push dateTue, 15 Mar 2016 09:44:58 +0000
treeherderfx-team@dd0baa33759d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1250709
milestone48.0a1
backs out5b48be011a930964b86ba5276e772a8c174c6f91
Backed out changeset 5b48be011a93 (bug 1250709)
testing/mozharness/scripts/spidermonkey/build.shell
testing/taskcluster/scripts/builder/build-shell-haz-linux.sh
testing/taskcluster/tasks/branches/try/job_flags.yml
testing/taskcluster/tasks/builds/haz_shell_linux.yml
--- a/testing/mozharness/scripts/spidermonkey/build.shell
+++ b/testing/mozharness/scripts/spidermonkey/build.shell
@@ -1,6 +1,9 @@
-#!/bin/bash -ex
+#!/bin/sh
+
+set -e
+set -x
 
-mkdir -p "$MOZ_OBJDIR"
-cd "$MOZ_OBJDIR"
-"$GECKO_DIR"/js/src/configure --enable-debug --enable-optimize --enable-stdcxx-compat --enable-ctypes --enable-nspr-build
+[ -d $ANALYZED_OBJDIR ] || mkdir $ANALYZED_OBJDIR
+cd $ANALYZED_OBJDIR
+$SOURCE/js/src/configure --enable-debug --enable-optimize --enable-stdcxx-compat --enable-ctypes --with-system-nspr
 make -j12 -s
deleted file mode 100755
--- a/testing/taskcluster/scripts/builder/build-shell-haz-linux.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash -ex
-
-# Ensure all the scripts in this dir are on the path....
-DIRNAME=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-PATH=$DIRNAME:$PATH
-
-WORKSPACE=$( cd "$1" && pwd )
-
-export GECKO_DIR="$WORKSPACE/gecko"
-export MOZ_OBJDIR="$WORKSPACE/obj-analyzed"
-
-mkdir -p "$MOZ_OBJDIR"
-
-install-packages.sh "$GECKO_DIR"
-
-. hazard-analysis.sh
-. setup-ccache.sh
-
-build_js_shell
-
-# Artifacts folder is outside of the cache.
-mkdir -p $HOME/artifacts/ || true
-
-function onexit () {
-    grab_artifacts "$WORKSPACE/analysis" "$HOME/artifacts"
-}
-
-trap onexit EXIT
-
-configure_analysis "$WORKSPACE/analysis"
-run_analysis "$WORKSPACE/analysis" shell
-
-check_hazards "$WORKSPACE/analysis"
-
-################################### script end ###################################
--- a/testing/taskcluster/tasks/branches/try/job_flags.yml
+++ b/testing/taskcluster/tasks/branches/try/job_flags.yml
@@ -76,22 +76,16 @@ builds:
       opt:
         task: tasks/builds/opt_linux64_st-an_clobber.yml
   linux64-haz:
     platforms:
       - Linux64
     types:
       debug:
         task: tasks/builds/haz_linux.yml
-  linux64-shell-haz:
-    platforms:
-      - Linux64
-    types:
-      debug:
-        task: tasks/builds/haz_shell_linux.yml
   macosx64:
     platforms:
       - MacOSX64
     types:
       opt:
         task: tasks/builds/opt_macosx64_clobber.yml
       debug:
         task: tasks/builds/dbg_macosx64_clobber.yml
deleted file mode 100644
--- a/testing/taskcluster/tasks/builds/haz_shell_linux.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-$inherits:
-  from: 'tasks/builds/firefox_base.yml'
-  variables:
-    build_name: 'shell-haz'
-    build_type: 'debug'
-task:
-  metadata:
-    name: '[TC] JS Shell Hazard Linux'
-    description: JS Shell Hazard Analysis Linux
-
-  workerType: dbg-linux64
-
-  scopes:
-    - 'docker-worker:cache:tooltool-cache'
-    - 'docker-worker:relengapi-proxy:tooltool.download.public'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-linux64-haz-workspace'
-
-  payload:
-    cache:
-      level-{{level}}-{{project}}-build-linux64-haz-workspace: '/home/worker/workspace'
-      tooltool-cache: '/home/worker/tools/tooltool-cache'
-
-    features:
-      relengAPIProxy: true
-
-    env:
-      TOOLTOOL_CACHE: '/home/worker/tools/tooltool-cache'
-      TOOLTOOL_MANIFEST: 'browser/config/tooltool-manifests/linux64/hazard.manifest'
-
-    maxRunTime: 36000
-
-    command:
-      - /bin/bash
-      - -c
-      - >
-        tc-vcs checkout workspace/gecko "$GECKO_BASE_REPOSITORY" "$GECKO_HEAD_REPOSITORY" "$GECKO_HEAD_REV" "$GECKO_HEAD_REF" &&
-        cd ./workspace/gecko/testing/taskcluster/scripts/builder &&
-        ./build-shell-haz-linux.sh $HOME/workspace
-
-  extra:
-    treeherderEnv:
-      - production
-      - staging
-    treeherder:
-      machine:
-        # see https://github.com/mozilla/treeherder/blob/master/ui/js/values.js
-        platform: linux64
-      groupSymbol: SM-tc
-      groupName: SpiderMonkey, submitted by taskcluster
-      symbol: H
-      collection:
-        debug: true
-    # Rather then enforcing particular conventions we require that all build
-    # tasks provide the "build" extra field to specify where the build and tests
-    # files are located.
-    locations:
-      build: null
-      tests: null