diff --git a/browser/config/mozconfigs/linux64/nightly-fuzzing-cov b/browser/config/mozconfigs/linux64/nightly-fuzzing-ccov similarity index 96% rename from browser/config/mozconfigs/linux64/nightly-fuzzing-cov rename to browser/config/mozconfigs/linux64/nightly-fuzzing-ccov index 46a33ed99fee..ea7fac2a564b 100644 --- a/browser/config/mozconfigs/linux64/nightly-fuzzing-cov +++ b/browser/config/mozconfigs/linux64/nightly-fuzzing-ccov @@ -32,7 +32,7 @@ unset MOZ_STDCXX_COMPAT export MOZ_PACKAGE_JSSHELL=1 # Need this to prevent name conflicts with the normal nightly build packages -export MOZ_PKG_SPECIAL=asan-cov +export MOZ_PKG_SPECIAL=asan-ccov . "$topsrcdir/build/mozconfig.common.override" diff --git a/taskcluster/ci/build/linux.yml b/taskcluster/ci/build/linux.yml index 56e095d15716..333dbdda9fab 100644 --- a/taskcluster/ci/build/linux.yml +++ b/taskcluster/ci/build/linux.yml @@ -594,7 +594,7 @@ linux64-asan-fuzzing-ccov/opt: description: "Linux64 Fuzzing Opt ASAN w/ Coverage" index: product: firefox - job-name: linux64-fuzzing-asan-opt-cov + job-name: linux64-ccov-fuzzing-asan-opt treeherder: platform: linux64/asan symbol: Bocf @@ -612,7 +612,7 @@ linux64-asan-fuzzing-ccov/opt: - builds/releng_base_linux_64_builds.py script: "mozharness/scripts/fx_desktop_build.py" secrets: true - custom-build-variant-cfg: fuzzing-cov + custom-build-variant-cfg: fuzzing-ccov tooltool-downloads: public need-xvfb: true toolchains: diff --git a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_cov.py b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_ccov.py similarity index 89% rename from testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_cov.py rename to testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_ccov.py index 5afeff4eb283..7567ca9bf208 100644 --- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_cov.py +++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_ccov.py @@ -7,7 +7,7 @@ config = { 'check-test', # 'update', ], - 'stage_platform': 'linux64-fuzzing-cov', + 'stage_platform': 'linux64-fuzzing-ccov', #### 64 bit build specific ##### 'env': { 'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'), @@ -25,6 +25,6 @@ config = { 'PATH': '/usr/local/bin:/bin:\ /usr/bin:/usr/local/sbin:/usr/sbin:/sbin', }, - 'mozconfig_variant': 'nightly-fuzzing-cov', + 'mozconfig_variant': 'nightly-fuzzing-ccov', ####################### } diff --git a/testing/mozharness/mozharness/mozilla/building/buildbase.py b/testing/mozharness/mozharness/mozilla/building/buildbase.py index 0fa76d2cbbdc..e28cb0415b30 100755 --- a/testing/mozharness/mozharness/mozilla/building/buildbase.py +++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py @@ -414,7 +414,7 @@ class BuildOptionParser(object): 'cross-artifact': 'builds/releng_sub_%s_configs/%s_cross_artifact.py', 'debug': 'builds/releng_sub_%s_configs/%s_debug.py', 'fuzzing-debug': 'builds/releng_sub_%s_configs/%s_fuzzing_debug.py', - 'fuzzing-cov': 'builds/releng_sub_%s_configs/%s_fuzzing_cov.py', + 'fuzzing-ccov': 'builds/releng_sub_%s_configs/%s_fuzzing_ccov.py', 'asan-and-debug': 'builds/releng_sub_%s_configs/%s_asan_and_debug.py', 'asan-tc-and-debug': 'builds/releng_sub_%s_configs/%s_asan_tc_and_debug.py', 'lto-tc': 'builds/releng_sub_%s_configs/%s_lto_tc.py',