Commit 0e33cb94 authored by Steve Fink's avatar Steve Fink
Browse files

Backed out changeset 68e3c6430121 (bug 1250709) 

--HG--
extra : rebase_source : bd6f14119dbae180817ddcfbfd9d57d2c7afc0b0
parent 1153138e

js/src/devtools/rootAnalysis/analyze.py

+0 −4
Original line number Diff line number Diff line
@@ -106,10 +106,6 @@ JOBS = { 'dbs': 
               '.'),

              ()),



         'list-dbs':

             (('ls', '-l'),

              ()),



         'callgraph':

             (('%(js)s', '%(analysis_scriptdir)s/computeCallgraph.js'),

              'callgraph.txt'),

testing/taskcluster/scripts/builder/hazard-analysis.sh

+1 −23
Original line number Diff line number Diff line
@@ -16,19 +16,8 @@ fi 
export CC="$GECKO_DIR/gcc/bin/gcc"

export CXX="$GECKO_DIR/gcc/bin/g++"



function check_commit_msg () {

    hg --cwd "$GECKO_DIR" log -r. --template '{desc}\n' | grep -q -- "$1"

}



if check_commit_msg "--dep"; then

    HAZ_DEP=1

fi



function build_js_shell () {

    ( cd $JS_SRCDIR; autoconf-2.13 )

    if [[ -z "$HAZ_DEP" ]]; then

        [ -d $HAZARD_SHELL_OBJDIR ] && rm -rf $HAZARD_SHELL_OBJDIR

    fi

    mkdir -p $HAZARD_SHELL_OBJDIR || true

    cd $HAZARD_SHELL_OBJDIR

    $JS_SRCDIR/configure --enable-optimize --disable-debug --enable-ctypes --enable-nspr-build --without-intl-api --with-ccache
@@ -39,10 +28,6 @@ function configure_analysis () { 
    local analysis_dir

    analysis_dir="$1"



    if [[ -z "$HAZ_DEP" ]]; then

        [ -d "$analysis_dir" ] && rm -rf "$analysis_dir"

    fi



    mkdir -p "$analysis_dir" || true

    (

        cd "$analysis_dir"
@@ -63,10 +48,6 @@ function run_analysis () { 
    local build_type

    build_type="$2"



    if [[ -z "$HAZ_DEP" ]]; then

        [ -d $MOZ_OBJDIR ] && rm -rf $MOZ_OBJDIR

    fi



    (

        cd "$analysis_dir"

        $PYTHON "$ANALYSIS_SRCDIR/analyze.py" --buildcommand="$GECKO_DIR/testing/mozharness/scripts/spidermonkey/build.${build_type}"
@@ -91,11 +72,8 @@ function grab_artifacts () { 
        done



        # Check whether the user requested .xdb file upload in the top commit comment

        if check_commit_msg "--upload-xdbs"; then

            HAZ_UPLOAD_XDBS=1

        fi



        if [ -n "$HAZ_UPLOAD_XDBS" ]; then

        if hg --cwd "$GECKO_DIR" log -l1 --template '{desc}\n' | grep -q -- '--upload-xdbs'; then

            for f in *.xdb; do

                bzip2 -c "$f" > "${artifacts}/$f.bz2"

            done