Commit 62230285 authored by Christian Holler's avatar Christian Holler
Browse files

Bug 1580128 - Simplify required env variables for fuzzing interface. r=froydnj 

Differential Revision: https://phabricator.services.mozilla.com/D45318

--HG--
extra : moz-landing-system : lando
parent d669157b

browser/app/nsBrowserApp.cpp

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ static int do_main(int argc, char* argv[], char* envp[]) { 
#endif



#ifdef LIBFUZZER

  if (getenv("LIBFUZZER"))

  if (getenv("FUZZER"))

    gBootstrap->XRE_LibFuzzerSetDriver(fuzzer::FuzzerDriver);

#endif

tools/fuzzing/interface/harness/FuzzerRunner.cpp

+3 −10
Original line number Diff line number Diff line
@@ -27,17 +27,10 @@ int FuzzerRunner::Run(int* argc, char*** argv) { 
  const char* fuzzerEnv = getenv("FUZZER");



  if (!fuzzerEnv) {

    fuzzerEnv = getenv("LIBFUZZER");

    if (fuzzerEnv) {

      fprintf(stderr,

              "Fuzzer Interface: Warning: \

        Using deprecated LIBFUZZER variable, use FUZZER instead\n");

    } else {

    fprintf(stderr,

            "Must specify fuzzing target in FUZZER environment variable\n");

    return 1;

  }

  }



  std::string moduleNameStr(fuzzerEnv);

  FuzzerFunctions funcs =

xpcom/glue/standalone/nsXPCOMGlue.cpp

+5 −1
Original line number Diff line number Diff line
@@ -256,7 +256,11 @@ static nsresult XPCOMGlueLoad(const char* aXPCOMFile, 
    cursor = xpcomDir;

  }



  if (getenv("MOZ_RUN_GTEST")) {

  if (getenv("MOZ_RUN_GTEST")

#  ifdef FUZZING

      || getenv("FUZZER")

#  endif

  ) {

    strcat(xpcomDir, ".gtest");

  }