upstream/mercurial-mirror Files · contrib/fuzz/pyutil.cc

copies: add test that makes both the merging csets dirty and fails...

copies: add test that makes both the merging csets dirty and fails This patch is a part of series which is about the case when both the merging csets are not descendant of merge base. The existing code assumes if c1 is dirty there shouldn't be any partial copies from c2 i.e both2['incomplete'] and same for c2, if c2 is dirty both1['incomplete'] should be empty, but this is not the right assumption. Now as we know we can have both c1 and c2 dirty at the same time, it is possible that c1 is dirty and both2['incomplete'] has some value. Or if c2 is dirty and both1['incomplete'] has some value. Added test shows that because of this assumption it could fail. Differential Revision: https://phab.mercurial-scm.org/D5962

Augie Fackler - - Load All Authors

File last commit:

r41049:ef103c96 default


                r42097:fc4b7a46

default

Download file

             pyutil.cc
        
                    49 lines
            
             | 1.2 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / contrib / fuzz / pyutil.cc
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #include "pyutil.h"

      #include <string>

      namespace contrib

      {

      static char cpypath[8192] = "\0";

      static PyObject *mainmod;

      static PyObject *globals;

      /* TODO: use Python 3 for this fuzzing? */

      PyMODINIT_FUNC initparsers(void);

      void initpy(const char *cselfpath)

      {

      	const std::string subdir = "/sanpy/lib/python2.7";

      	/* HACK ALERT: we need a full Python installation built without

      	   pymalloc and with ASAN, so we dump one in

      	   $OUT/sanpy/lib/python2.7. This helps us wire that up. */

      	std::string selfpath(cselfpath);

      	std::string pypath;

      	auto pos = selfpath.rfind("/");

      	if (pos == std::string::npos) {

      		char wd[8192];

      		getcwd(wd, 8192);

      		pypath = std::string(wd) + subdir;

      	} else {

      		pypath = selfpath.substr(0, pos) + subdir;

      	}

      	strncpy(cpypath, pypath.c_str(), pypath.size());

      	setenv("PYTHONPATH", cpypath, 1);

      	setenv("PYTHONNOUSERSITE", "1", 1);

      	/* prevent Python from looking up users in the fuzz environment */

      	setenv("PYTHONUSERBASE", cpypath, 1);

      	Py_SetPythonHome(cpypath);

      	Py_InitializeEx(0);

      	mainmod = PyImport_AddModule("__main__");

      	globals = PyModule_GetDict(mainmod);

      	initparsers();

      }

      PyObject *pyglobals()

      {

      	return globals;

      }

      } // namespace contrib

	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

				#include "pyutil.h"

				#include <string>

				namespace contrib
				{

				static char cpypath[8192] = "\0";

				static PyObject *mainmod;
				static PyObject *globals;

				/* TODO: use Python 3 for this fuzzing? */
				PyMODINIT_FUNC initparsers(void);

				void initpy(const char *cselfpath)
				{
				const std::string subdir = "/sanpy/lib/python2.7";
				/* HACK ALERT: we need a full Python installation built without
				pymalloc and with ASAN, so we dump one in
				$OUT/sanpy/lib/python2.7. This helps us wire that up. */
				std::string selfpath(cselfpath);
				std::string pypath;
				auto pos = selfpath.rfind("/");
				if (pos == std::string::npos) {
				char wd[8192];
				getcwd(wd, 8192);
				pypath = std::string(wd) + subdir;
				} else {
				pypath = selfpath.substr(0, pos) + subdir;
				}
				strncpy(cpypath, pypath.c_str(), pypath.size());
				setenv("PYTHONPATH", cpypath, 1);
				setenv("PYTHONNOUSERSITE", "1", 1);
				/* prevent Python from looking up users in the fuzz environment */
				setenv("PYTHONUSERBASE", cpypath, 1);
				Py_SetPythonHome(cpypath);
				Py_InitializeEx(0);
				mainmod = PyImport_AddModule("__main__");
				globals = PyModule_GetDict(mainmod);
				initparsers();
				}

				PyObject *pyglobals()
				{
				return globals;
				}

				} // namespace contrib