upstream/mercurial-mirror Files · contrib/fuzz/README.rst

resolve: add option to warn/abort on -m with unresolved conflict markers...

resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

Augie Fackler - - Load All Authors

File last commit:

r36716:e437de38 default


                r38817:bb54db4a

@96 default

Download file

             README.rst
        
                    26 lines
            
             | 894 B
            
                | text/x-rst
            
             |
                RstLexer
            
             / contrib / fuzz / README.rst
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Augie Fackler
    
fuzz: add a quick README to try and document how to test new fuzzers...

              r36698
            
      How to add fuzzers (partially cribbed from oss-fuzz[0]):

        1) git clone https://github.com/google/oss-fuzz

        2) cd oss-fuzz

        3) python infra/helper.py build_image mercurial

        4) docker run --cap-add=SYS_PTRACE -it -v $HG_REPO_PATH:/hg-new \

               gcr.io/oss-fuzz/mercurial bash

        5) cd /src

        6) rm -r mercurial

        7) ln -s /hg-new mercurial

        8) cd mercurial

        9) compile

        Augie Fackler
    
fuzz: add some more docs about building/running fuzzers...

              r36716
            
        10) ls $OUT

      Step 9 is literally running the command "compile", which is part of

      the docker container. Once you have that working, you can build the

      fuzzers like this (in the oss-fuzz repo):

      python infra/helper.py build_fuzzers --sanitizer address mercurial $HG_REPO_PATH

      (you can also say "memory", "undefined" or "coverage" for

      sanitizer). Then run the built fuzzers like this:

      python infra/helper.py run_fuzzer mercurial -- $FUZZER

        Augie Fackler
    
fuzz: add a quick README to try and document how to test new fuzzers...

              r36698
            
      0: https://github.com/google/oss-fuzz/blob/master/docs/new_project_guide.md

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

Augie Fackler fuzz: add a quick README to try and document how to test new fuzzers...	r36698	How to add fuzzers (partially cribbed from oss-fuzz[0]):

		1) git clone https://github.com/google/oss-fuzz
		2) cd oss-fuzz
		3) python infra/helper.py build_image mercurial
		4) docker run --cap-add=SYS_PTRACE -it -v $HG_REPO_PATH:/hg-new \
		gcr.io/oss-fuzz/mercurial bash
		5) cd /src
		6) rm -r mercurial
		7) ln -s /hg-new mercurial
		8) cd mercurial
		9) compile
Augie Fackler fuzz: add some more docs about building/running fuzzers...	r36716	10) ls $OUT

		Step 9 is literally running the command "compile", which is part of
		the docker container. Once you have that working, you can build the
		fuzzers like this (in the oss-fuzz repo):

		python infra/helper.py build_fuzzers --sanitizer address mercurial $HG_REPO_PATH

		(you can also say "memory", "undefined" or "coverage" for
		sanitizer). Then run the built fuzzers like this:

		python infra/helper.py run_fuzzer mercurial -- $FUZZER
Augie Fackler fuzz: add a quick README to try and document how to test new fuzzers...	r36698
		0: https://github.com/google/oss-fuzz/blob/master/docs/new_project_guide.md