This revision was automatically updated to reflect the committed changes.
Closed by commit rHG04d64163039a: fuzz: fix xdiff build (authored by quark, 
committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2707?vs=6689&id=6690

REVISION DETAIL
  https://phab.mercurial-scm.org/D2707

AFFECTED FILES
  contrib/fuzz/Makefile
  contrib/fuzz/xdiff.cc

CHANGE DETAILS

diff --git a/contrib/fuzz/xdiff.cc b/contrib/fuzz/xdiff.cc
--- a/contrib/fuzz/xdiff.cc
+++ b/contrib/fuzz/xdiff.cc
@@ -37,20 +37,13 @@
        b.size = Size - split;
        xpparam_t xpp = {
            XDF_INDENT_HEURISTIC, /* flags */
-           NULL,                 /* anchors */
-           0,                    /* anchors_nr */
        };
        xdemitconf_t xecfg = {
-           0,                  /* ctxlen */
-           0,                  /* interhunkctxlen */
            XDL_EMIT_BDIFFHUNK, /* flags */
-           NULL,               /* find_func */
-           NULL,               /* find_func_priv */
            hunk_consumer,      /* hunk_consume_func */
        };
        xdemitcb_t ecb = {
            NULL, /* priv */
-           NULL, /* outf */
        };
        xdl_diff(&a, &b, &xpp, &xecfg, &ecb);
        return 0; // Non-zero return values are reserved for future use.
diff --git a/contrib/fuzz/Makefile b/contrib/fuzz/Makefile
--- a/contrib/fuzz/Makefile
+++ b/contrib/fuzz/Makefile
@@ -18,19 +18,19 @@
          -o $@ \
          $<
 
-xdiff: xdiff.cc xdiffi.o  xemit.o  xmerge.o  xprepare.o  xutils.o
+xdiff: xdiff.cc xdiffi.o xprepare.o  xutils.o
        clang -DHG_FUZZER_INCLUDE_MAIN=1 -g -O1 
-fsanitize=fuzzer-no-link,address \
          -I../../mercurial xdiff.cc \
-         xdiffi.o xemit.o xmerge.o xprepare.o xutils.o -o xdiff
+         xdiffi.o xprepare.o xutils.o -o xdiff
 
 fuzz-x%.o: ../../mercurial/thirdparty/xdiff/x%.c 
../../mercurial/thirdparty/xdiff/*.h
        $$CC $$CFLAGS -c \
          -o $@ \
          $<
 
-xdiff_fuzzer: xdiff.cc fuzz-xdiffi.o  fuzz-xemit.o  fuzz-xmerge.o  
fuzz-xprepare.o  fuzz-xutils.o
+xdiff_fuzzer: xdiff.cc fuzz-xdiffi.o fuzz-xprepare.o  fuzz-xutils.o
        $$CXX $$CXXFLAGS -std=c++11 -I../../mercurial xdiff.cc \
-         fuzz-xdiffi.o fuzz-xemit.o fuzz-xmerge.o fuzz-xprepare.o 
fuzz-xutils.o \
+         fuzz-xdiffi.o fuzz-xprepare.o fuzz-xutils.o \
          -lFuzzingEngine -o $$OUT/xdiff_fuzzer
 
 all: bdiff xdiff



To: quark, #hg-reviewers, indygreg
Cc: mercurial-devel
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Reply via email to