##// END OF EJS Templates
copies: add test that makes both the merging csets dirty and run w/o error...
copies: add test that makes both the merging csets dirty and run w/o error This series of patches is to cover a case in fullcopytracing algorithms where both the merging csets are not descendant of merge base. In this algorithm we call a merging cset "dirty" if that cset is not the descendant of merge base. That said, added test in this patch cover case when both the merging csets are "dirty". Actually this case of "both dirty" was encountered by Pulkit when he was working on content-divergence where it is possible that both the csets are not descendant of merging base. For reference you can look into: https://phab.mercurial-scm.org/D3896 As this test run fine without any error and correctly traced the copies, I added this test to make sure that it doesn't break even after I will modify some code in next patches to fix an error. Next patch adds the tests where this algorithm throws an error for the same case of "both dirty". Differential Revision: https://phab.mercurial-scm.org/D5961

File last commit:

r41175:2e60a77b default
r42096:cbdd2b56 default
Show More
xdiff.cc
63 lines | 1.4 KiB | text/x-c | CppLexer
Augie Fackler
fuzz: add a fuzzer for xdiff...
r36697 /*
* xdiff.cc - fuzzer harness for thirdparty/xdiff
*
* Copyright 2018, Google Inc.
*
* This software may be used and distributed according to the terms of
* the GNU General Public License, incorporated herein by reference.
*/
#include "thirdparty/xdiff/xdiff.h"
#include <inttypes.h>
#include <stdlib.h>
Augie Fackler
fuzz: extract some common utilities and use modern C++ idioms...
r38191 #include "fuzzutil.h"
Augie Fackler
fuzz: add a fuzzer for xdiff...
r36697 extern "C" {
int hunk_consumer(long a1, long a2, long b1, long b2, void *priv)
{
// TODO: probably also test returning -1 from this when things break?
return 0;
}
int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)
{
Augie Fackler
xdiff: don't attempt to use fuzzer inputs larger than 100k...
r41175 // Don't allow fuzzer inputs larger than 100k, since we'll just bog
// down and not accomplish much.
if (Size > 100000) {
return 0;
}
Augie Fackler
fuzz: extract some common utilities and use modern C++ idioms...
r38191 auto maybe_inputs = SplitInputs(Data, Size);
if (!maybe_inputs) {
Augie Fackler
fuzz: add a fuzzer for xdiff...
r36697 return 0;
}
Augie Fackler
fuzz: extract some common utilities and use modern C++ idioms...
r38191 auto inputs = std::move(maybe_inputs.value());
Augie Fackler
fuzz: add a fuzzer for xdiff...
r36697 mmfile_t a, b;
Augie Fackler
fuzz: extract some common utilities and use modern C++ idioms...
r38191 a.ptr = inputs.left.get();
a.size = inputs.left_size;
b.ptr = inputs.right.get();
b.size = inputs.right_size;
Augie Fackler
fuzz: add a fuzzer for xdiff...
r36697 xpparam_t xpp = {
XDF_INDENT_HEURISTIC, /* flags */
};
xdemitconf_t xecfg = {
XDL_EMIT_BDIFFHUNK, /* flags */
hunk_consumer, /* hunk_consume_func */
};
xdemitcb_t ecb = {
NULL, /* priv */
};
xdl_diff(&a, &b, &xpp, &xecfg, &ecb);
return 0; // Non-zero return values are reserved for future use.
}
#ifdef HG_FUZZER_INCLUDE_MAIN
int main(int argc, char **argv)
{
const char data[] = "asdf";
return LLVMFuzzerTestOneInput((const uint8_t *)data, 4);
}
#endif
} // extern "C"