From 544b61c613d6c6d598478dd067e2909acd9a3de2 Mon Sep 17 00:00:00 2001 From: Dorel Luca Date: Wed, 29 Aug 2018 05:16:55 +0300 Subject: [PATCH] Backed out changeset 692efe8acba9 (bug 1486654) for wd failures on /builds/worker/workspace/build/tests/bin/geckodriver --- .../linux64/debug-static-analysis-clang | 21 ++++++++ .../linux64/opt-static-analysis-clang | 20 +++++++ browser/config/mozconfigs/linux64/tup | 1 - build/mozconfig.no-compile | 1 - build/unix/mozconfig.linux | 1 - .../ci/static-analysis-autotest/kind.yml | 1 + taskcluster/ci/static-analysis/kind.yml | 54 +++++++++++++++++++ .../64_stat_and_debug.py | 40 ++++++++++++++ .../64_stat_and_opt.py | 40 ++++++++++++++ 9 files changed, 176 insertions(+), 3 deletions(-) create mode 100644 browser/config/mozconfigs/linux64/debug-static-analysis-clang create mode 100644 browser/config/mozconfigs/linux64/opt-static-analysis-clang create mode 100644 testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_debug.py create mode 100644 testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_opt.py diff --git a/browser/config/mozconfigs/linux64/debug-static-analysis-clang b/browser/config/mozconfigs/linux64/debug-static-analysis-clang new file mode 100644 index 000000000000..8ecd647cb15c --- /dev/null +++ b/browser/config/mozconfigs/linux64/debug-static-analysis-clang @@ -0,0 +1,21 @@ +MOZ_AUTOMATION_BUILD_SYMBOLS=0 +MOZ_AUTOMATION_PACKAGE_TESTS=0 +MOZ_AUTOMATION_L10N_CHECK=0 + +. "$topsrcdir/build/mozconfig.common" + +ac_add_options --enable-debug +ac_add_options --enable-dmd + +. $topsrcdir/build/mozconfig.stylo + +# Use Clang as specified in manifest +export CC="$topsrcdir/clang/bin/clang" +export CXX="$topsrcdir/clang/bin/clang++" + +# Add the static checker +ac_add_options --enable-clang-plugin + +. "$topsrcdir/build/unix/mozconfig.stdcxx" + +. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/linux64/opt-static-analysis-clang b/browser/config/mozconfigs/linux64/opt-static-analysis-clang new file mode 100644 index 000000000000..3b7df063d16a --- /dev/null +++ b/browser/config/mozconfigs/linux64/opt-static-analysis-clang @@ -0,0 +1,20 @@ +MOZ_AUTOMATION_BUILD_SYMBOLS=0 +MOZ_AUTOMATION_PACKAGE_TESTS=0 +MOZ_AUTOMATION_L10N_CHECK=0 + +. "$topsrcdir/build/mozconfig.common" + +ac_add_options --enable-dmd + +. $topsrcdir/build/mozconfig.stylo + +# Use Clang as specified in manifest +CC="$topsrcdir/clang/bin/clang" +CXX="$topsrcdir/clang/bin/clang++" + +# Add the static checker +ac_add_options --enable-clang-plugin + +. "$topsrcdir/build/unix/mozconfig.stdcxx" + +. "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/linux64/tup b/browser/config/mozconfigs/linux64/tup index 359333b52afc..d5d65b781a01 100644 --- a/browser/config/mozconfigs/linux64/tup +++ b/browser/config/mozconfigs/linux64/tup @@ -14,7 +14,6 @@ export TUP=${TOOLTOOL_DIR}/tup/tup ac_add_options --enable-build-backends=Tup ac_add_options --disable-js-shell -unset ENABLE_CLANG_PLUGIN # To enable the option to upload the tup database, uncomment the line below # ac_add_options --upload-tup-db diff --git a/build/mozconfig.no-compile b/build/mozconfig.no-compile index 0a83e9551361..1dd913907b81 100644 --- a/build/mozconfig.no-compile +++ b/build/mozconfig.no-compile @@ -23,6 +23,5 @@ unset BINDGEN_CFLAGS unset LLVM_CONFIG unset WIN64_LINK unset WIN64_LIB -unset ENABLE_CLANG_PLUGIN unset MOZ_STDCXX_COMPAT diff --git a/build/unix/mozconfig.linux b/build/unix/mozconfig.linux index 4f73ef43dbb6..620ea6fbf036 100644 --- a/build/unix/mozconfig.linux +++ b/build/unix/mozconfig.linux @@ -13,7 +13,6 @@ if [ -n "$FORCE_GCC" -o -n "$MOZ_PGO" ]; then else CC="$TOOLTOOL_DIR/clang/bin/clang" CXX="$TOOLTOOL_DIR/clang/bin/clang++" - export ENABLE_CLANG_PLUGIN=1 fi # We want to make sure we use binutils and other binaries in the tooltool diff --git a/taskcluster/ci/static-analysis-autotest/kind.yml b/taskcluster/ci/static-analysis-autotest/kind.yml index b999dbfd8f9f..a2caba0906e6 100644 --- a/taskcluster/ci/static-analysis-autotest/kind.yml +++ b/taskcluster/ci/static-analysis-autotest/kind.yml @@ -42,6 +42,7 @@ jobs: run: config: - builds/releng_base_firefox.py + - builds/releng_sub_linux_configs/64_stat_and_debug.py tooltool-downloads: public keep-artifacts: false toolchains: diff --git a/taskcluster/ci/static-analysis/kind.yml b/taskcluster/ci/static-analysis/kind.yml index aa21ec84ca73..240f55c7a3d2 100644 --- a/taskcluster/ci/static-analysis/kind.yml +++ b/taskcluster/ci/static-analysis/kind.yml @@ -23,6 +23,60 @@ job-defaults: tier: 1 jobs: + linux64-st-an/debug: + description: "Linux64 Debug Static Analysis" + index: + job-name: linux64-st-an-debug + treeherder: + platform: linux64/debug + worker-type: aws-provisioner-v1/gecko-{level}-b-linux + worker: + max-run-time: 36000 + env: + PERFHERDER_EXTRA_OPTIONS: static-analysis + run: + using: mozharness + actions: [build] + config: + - builds/releng_base_firefox.py + - builds/releng_sub_linux_configs/64_stat_and_debug.py + script: "mozharness/scripts/fx_desktop_build.py" + tooltool-downloads: public + keep-artifacts: false + toolchains: + - linux64-clang + - linux64-rust + - linux64-cbindgen + - linux64-sccache + - linux64-node + + linux64-st-an/opt: + description: "Linux64 Opt Static Analysis" + index: + job-name: linux64-st-an-opt + treeherder: + platform: linux64/opt + worker-type: aws-provisioner-v1/gecko-{level}-b-linux + worker: + max-run-time: 36000 + env: + PERFHERDER_EXTRA_OPTIONS: static-analysis + run: + using: mozharness + actions: [build] + config: + - builds/releng_base_firefox.py + - builds/releng_sub_linux_configs/64_stat_and_opt.py + script: "mozharness/scripts/fx_desktop_build.py" + tooltool-downloads: public + keep-artifacts: false + toolchains: + - linux64-clang + - linux64-rust + - linux64-cbindgen + - linux64-sccache + - linux64-node + win32-st-an/debug: description: "Win32 Static Analysis Debug (clang-cl)" index: diff --git a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_debug.py b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_debug.py new file mode 100644 index 000000000000..08377f9e91a4 --- /dev/null +++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_debug.py @@ -0,0 +1,40 @@ +import os + +config = { + # note: overridden by MOZHARNESS_ACTIONS in TaskCluster tasks + 'default_actions': [ + 'clobber', + 'build', + ], + 'app_ini_path': '%(obj_dir)s/dist/bin/application.ini', + # decides whether we want to use moz_sign_cmd in env + 'vcs_share_base': '/builds/hg-shared', + ######################################################################### + + + ######################################################################### + ###### 64 bit specific ###### + 'base_name': 'Linux_x86-64_%(branch)s_Static_Analysis', + 'platform': 'linux64', + 'stage_platform': 'linux64-st-an-opt', + 'env': { + 'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'), + 'DISPLAY': ':2', + 'HG_SHARE_BASE_DIR': '/builds/hg-shared', + 'MOZ_OBJDIR': '%(abs_obj_dir)s', + 'TINDERBOX_OUTPUT': '1', + 'TOOLTOOL_CACHE': '/builds/worker/tooltool-cache', + 'TOOLTOOL_HOME': '/builds', + 'MOZ_CRASHREPORTER_NO_REPORT': '1', + 'LC_ALL': 'C', + ## 64 bit specific + 'PATH': '/usr/local/bin:/bin:\ +/usr/bin:/usr/local/sbin:/usr/sbin:/sbin', + ## + }, + # This doesn't actually inherit from anything. + 'mozconfig_platform': 'linux64', + 'mozconfig_variant': 'debug-static-analysis-clang', + ####################### + 'artifact_flag_build_variant_in_try': None, +} diff --git a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_opt.py b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_opt.py new file mode 100644 index 000000000000..1ada77a335e5 --- /dev/null +++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_opt.py @@ -0,0 +1,40 @@ +import os + +config = { + # note: overridden by MOZHARNESS_ACTIONS in TaskCluster tasks + 'default_actions': [ + 'clobber', + 'build', + ], + 'app_ini_path': '%(obj_dir)s/dist/bin/application.ini', + # decides whether we want to use moz_sign_cmd in env + 'vcs_share_base': '/builds/hg-shared', + ######################################################################### + + + ######################################################################### + ###### 64 bit specific ###### + 'base_name': 'Linux_x86-64_%(branch)s_Static_Analysis', + 'platform': 'linux64', + 'stage_platform': 'linux64-st-an', + 'env': { + 'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'), + 'DISPLAY': ':2', + 'HG_SHARE_BASE_DIR': '/builds/hg-shared', + 'MOZ_OBJDIR': '%(abs_obj_dir)s', + 'TINDERBOX_OUTPUT': '1', + 'TOOLTOOL_CACHE': '/builds/worker/tooltool-cache', + 'TOOLTOOL_HOME': '/builds', + 'MOZ_CRASHREPORTER_NO_REPORT': '1', + 'LC_ALL': 'C', + ## 64 bit specific + 'PATH': '/usr/local/bin:/bin:\ +/usr/bin:/usr/local/sbin:/usr/sbin:/sbin', + ## + }, + # This doesn't actually inherit from anything. + 'mozconfig_platform': 'linux64', + 'mozconfig_variant': 'opt-static-analysis-clang', + ####################### + 'artifact_flag_build_variant_in_try': None, +}