This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7563

fuzz: use a variable to allow specifying python-config to use
ClosedPublic

Authored by durin42 on Dec 6 2019, 3:51 PM.

Download Raw Diff

Details

Reviewers

indygreg

Group Reviewers

hg-reviewers

Commits

rHGbf0453866c80: fuzz: use a variable to allow specifying python-config to use
rHG4445e2775066: fuzz: use a variable to allow specifying python-config to use

Summary

Eventually we should probably default this to just python-config and have
the oss-fuzz build.sh script specify the sanpy python-config, but for now this
lets us make progress.

Diff Detail

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Dec 6 2019, 3:51 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptDec 6 2019, 3:51 PM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

durin42 added a child revision: D7564: fuzz: use a more standard approach to allow local builds of fuzzers.Dec 6 2019, 3:51 PM

indygreg accepted this revision.Dec 6 2019, 10:57 PM

This revision is now accepted and ready to land.Dec 6 2019, 10:57 PM

durin42 added a commit: rHG4445e2775066: fuzz: use a variable to allow specifying python-config to use.Dec 6 2019, 10:59 PM

Closed by commit rHG4445e2775066: fuzz: use a variable to allow specifying python-config to use (authored by durin42). · Explain Why

This revision was automatically updated to reflect the committed changes.

durin42 added a commit: rHGbf0453866c80: fuzz: use a variable to allow specifying python-config to use.Dec 7 2019, 12:54 PM

Revision Contents
Changeset List

			Path	Packages
M			contrib/fuzz/Makefile (44 lines)

Status	Author	Revision
Closed	durin42	D7568 fuzz: clean up some repetition on building parsers.so fuzzers
Closed	durin42	D7567 fuzz: remove legacy setup for running fuzzers outside oss-fuzz
Closed	durin42	D7566 tests: finally fix up test-fuzz-targets.t
Closed	durin42	D7565 fuzz: make standalone_fuzz_target_runner call LLVMFuzzerInitialize
Closed	durin42	D7564 fuzz: use a more standard approach to allow local builds of fuzzers
Closed	durin42	D7563 fuzz: use a variable to allow specifying python-config to use
Closed	durin42	D7562 fuzz: suppress deprecated-register warnings in our compile
Closed	durin42	D7561 fuzz: follow modern guidelines and use LIB_FUZZING_ENGINE
Closed	durin42	D7560 fuzz: always define LLVMFuzzerInitialize() even if we don't need it
Closed	durin42	D7559 fuzz: remove debug prints from revlog_corpus.py
Closed	durin42	D7558 fuzz: fix an unused result on getcwd() in pyutil

Diff 18514

contrib/fuzz/Makefile

	CC = clang			CC = clang
	CXX = clang++			CXX = clang++

	LIB_FUZZING_ENGINE ?= -lFuzzingEngine			LIB_FUZZING_ENGINE ?= -lFuzzingEngine

				PYTHON_CONFIG ?= $$OUT/sanpy/bin/python-config

	CXXFLAGS += -Wno-deprecated-register			CXXFLAGS += -Wno-deprecated-register

	all: bdiff mpatch xdiff			all: bdiff mpatch xdiff

	pyutil.o: pyutil.cc pyutil.h			pyutil.o: pyutil.cc pyutil.h
	$(CXX) $(CXXFLAGS) -g -O1 \			$(CXX) $(CXXFLAGS) -g -O1 \
	`$$OUT/sanpy/bin/python-config --cflags` \			`$(PYTHON_CONFIG) --cflags` \
	-I../../mercurial -c -o pyutil.o pyutil.cc			-I../../mercurial -c -o pyutil.o pyutil.cc

	bdiff.o: ../../mercurial/bdiff.c			bdiff.o: ../../mercurial/bdiff.c
	$(CC) $(CFLAGS) -fsanitize=fuzzer-no-link,address -c -o bdiff.o \			$(CC) $(CFLAGS) -fsanitize=fuzzer-no-link,address -c -o bdiff.o \
	../../mercurial/bdiff.c			../../mercurial/bdiff.c

	bdiff: bdiff.cc bdiff.o			bdiff: bdiff.cc bdiff.o
	$(CXX) $(CXXFLAGS) -DHG_FUZZER_INCLUDE_MAIN=1 -g -O1 -fsanitize=fuzzer-no-link,address \			$(CXX) $(CXXFLAGS) -DHG_FUZZER_INCLUDE_MAIN=1 -g -O1 -fsanitize=fuzzer-no-link,address \
	$<			$<

	xdiff_fuzzer: xdiff.cc fuzz-xdiffi.o fuzz-xprepare.o fuzz-xutils.o			xdiff_fuzzer: xdiff.cc fuzz-xdiffi.o fuzz-xprepare.o fuzz-xutils.o
	$(CXX) $(CXXFLAGS) -std=c++17 -I../../mercurial xdiff.cc \			$(CXX) $(CXXFLAGS) -std=c++17 -I../../mercurial xdiff.cc \
	fuzz-xdiffi.o fuzz-xprepare.o fuzz-xutils.o \			fuzz-xdiffi.o fuzz-xprepare.o fuzz-xutils.o \
	$(LIB_FUZZING_ENGINE) -o $$OUT/xdiff_fuzzer			$(LIB_FUZZING_ENGINE) -o $$OUT/xdiff_fuzzer

	manifest.o: ../../mercurial/cext/manifest.c			manifest.o: ../../mercurial/cext/manifest.c
	$(CC) $(CFLAGS) `$$OUT/sanpy/bin/python-config --cflags` \			$(CC) $(CFLAGS) `$(PYTHON_CONFIG) --cflags` \
	-I../../mercurial \			-I../../mercurial \
	-c -o manifest.o ../../mercurial/cext/manifest.c			-c -o manifest.o ../../mercurial/cext/manifest.c

	charencode.o: ../../mercurial/cext/charencode.c			charencode.o: ../../mercurial/cext/charencode.c
	$(CC) $(CFLAGS) `$$OUT/sanpy/bin/python-config --cflags` \			$(CC) $(CFLAGS) `$(PYTHON_CONFIG) --cflags` \
	-I../../mercurial \			-I../../mercurial \
	-c -o charencode.o ../../mercurial/cext/charencode.c			-c -o charencode.o ../../mercurial/cext/charencode.c

	parsers.o: ../../mercurial/cext/parsers.c			parsers.o: ../../mercurial/cext/parsers.c
	$(CC) $(CFLAGS) `$$OUT/sanpy/bin/python-config --cflags` \			$(CC) $(CFLAGS) `$(PYTHON_CONFIG) --cflags` \
	-I../../mercurial \			-I../../mercurial \
	-c -o parsers.o ../../mercurial/cext/parsers.c			-c -o parsers.o ../../mercurial/cext/parsers.c

	dirs.o: ../../mercurial/cext/dirs.c			dirs.o: ../../mercurial/cext/dirs.c
	$(CC) $(CFLAGS) `$$OUT/sanpy/bin/python-config --cflags` \			$(CC) $(CFLAGS) `$(PYTHON_CONFIG) --cflags` \
	-I../../mercurial \			-I../../mercurial \
	-c -o dirs.o ../../mercurial/cext/dirs.c			-c -o dirs.o ../../mercurial/cext/dirs.c

	pathencode.o: ../../mercurial/cext/pathencode.c			pathencode.o: ../../mercurial/cext/pathencode.c
	$(CC) $(CFLAGS) `$$OUT/sanpy/bin/python-config --cflags` \			$(CC) $(CFLAGS) `$(PYTHON_CONFIG) --cflags` \
	-I../../mercurial \			-I../../mercurial \
	-c -o pathencode.o ../../mercurial/cext/pathencode.c			-c -o pathencode.o ../../mercurial/cext/pathencode.c

	revlog.o: ../../mercurial/cext/revlog.c			revlog.o: ../../mercurial/cext/revlog.c
	$(CC) $(CFLAGS) `$$OUT/sanpy/bin/python-config --cflags` \			$(CC) $(CFLAGS) `$(PYTHON_CONFIG) --cflags` \
	-I../../mercurial \			-I../../mercurial \
	-c -o revlog.o ../../mercurial/cext/revlog.c			-c -o revlog.o ../../mercurial/cext/revlog.c

	dirs_fuzzer: dirs.cc manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o			dirs_fuzzer: dirs.cc manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o
	$(CXX) $(CXXFLAGS) `$$OUT/sanpy/bin/python-config --cflags` \			$(CXX) $(CXXFLAGS) `$(PYTHON_CONFIG) --cflags` \
	-Wno-register -Wno-macro-redefined \			-Wno-register -Wno-macro-redefined \
	-I../../mercurial dirs.cc \			-I../../mercurial dirs.cc \
	manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o \			manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o \
	$(LIB_FUZZING_ENGINE) `$$OUT/sanpy/bin/python-config --ldflags` \			$(LIB_FUZZING_ENGINE) `$(PYTHON_CONFIG) --ldflags` \
	-o $$OUT/dirs_fuzzer			-o $$OUT/dirs_fuzzer

	fncache_fuzzer: fncache.cc manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o			fncache_fuzzer: fncache.cc manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o
	$(CXX) $(CXXFLAGS) `$$OUT/sanpy/bin/python-config --cflags` \			$(CXX) $(CXXFLAGS) `$(PYTHON_CONFIG) --cflags` \
	-Wno-register -Wno-macro-redefined \			-Wno-register -Wno-macro-redefined \
	-I../../mercurial fncache.cc \			-I../../mercurial fncache.cc \
	manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o \			manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o \
	$(LIB_FUZZING_ENGINE) `$$OUT/sanpy/bin/python-config --ldflags` \			$(LIB_FUZZING_ENGINE) `$(PYTHON_CONFIG) --ldflags` \
	-o $$OUT/fncache_fuzzer			-o $$OUT/fncache_fuzzer

	jsonescapeu8fast_fuzzer: jsonescapeu8fast.cc manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o			jsonescapeu8fast_fuzzer: jsonescapeu8fast.cc manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o
	$(CXX) $(CXXFLAGS) `$$OUT/sanpy/bin/python-config --cflags` \			$(CXX) $(CXXFLAGS) `$(PYTHON_CONFIG) --cflags` \
	-Wno-register -Wno-macro-redefined \			-Wno-register -Wno-macro-redefined \
	-I../../mercurial jsonescapeu8fast.cc \			-I../../mercurial jsonescapeu8fast.cc \
	manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o \			manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o \
	$(LIB_FUZZING_ENGINE) `$$OUT/sanpy/bin/python-config --ldflags` \			$(LIB_FUZZING_ENGINE) `$(PYTHON_CONFIG) --ldflags` \
	-o $$OUT/jsonescapeu8fast_fuzzer			-o $$OUT/jsonescapeu8fast_fuzzer

	manifest_corpus.zip:			manifest_corpus.zip:
	python manifest_corpus.py $$OUT/manifest_fuzzer_seed_corpus.zip			python manifest_corpus.py $$OUT/manifest_fuzzer_seed_corpus.zip

	manifest_fuzzer: manifest.cc manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o			manifest_fuzzer: manifest.cc manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o
	$(CXX) $(CXXFLAGS) `$$OUT/sanpy/bin/python-config --cflags` \			$(CXX) $(CXXFLAGS) `$(PYTHON_CONFIG) --cflags` \
	-Wno-register -Wno-macro-redefined \			-Wno-register -Wno-macro-redefined \
	-I../../mercurial manifest.cc \			-I../../mercurial manifest.cc \
	manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o \			manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o \
	$(LIB_FUZZING_ENGINE) `$$OUT/sanpy/bin/python-config --ldflags` \			$(LIB_FUZZING_ENGINE) `$(PYTHON_CONFIG) --ldflags` \
	-o $$OUT/manifest_fuzzer			-o $$OUT/manifest_fuzzer

	revlog_fuzzer: revlog.cc manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o			revlog_fuzzer: revlog.cc manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o
	$(CXX) $(CXXFLAGS) `$$OUT/sanpy/bin/python-config --cflags` \			$(CXX) $(CXXFLAGS) `$(PYTHON_CONFIG) --cflags` \
	-Wno-register -Wno-macro-redefined \			-Wno-register -Wno-macro-redefined \
	-I../../mercurial revlog.cc \			-I../../mercurial revlog.cc \
	manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o \			manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o \
	$(LIB_FUZZING_ENGINE) `$$OUT/sanpy/bin/python-config --ldflags` \			$(LIB_FUZZING_ENGINE) `$(PYTHON_CONFIG) --ldflags` \
	-o $$OUT/revlog_fuzzer			-o $$OUT/revlog_fuzzer

	revlog_corpus.zip:			revlog_corpus.zip:
	python revlog_corpus.py $$OUT/revlog_fuzzer_seed_corpus.zip			python revlog_corpus.py $$OUT/revlog_fuzzer_seed_corpus.zip

	dirstate_fuzzer: dirstate.cc manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o			dirstate_fuzzer: dirstate.cc manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o
	$(CXX) $(CXXFLAGS) `$$OUT/sanpy/bin/python-config --cflags` \			$(CXX) $(CXXFLAGS) `$(PYTHON_CONFIG) --cflags` \
	-Wno-register -Wno-macro-redefined \			-Wno-register -Wno-macro-redefined \
	-I../../mercurial dirstate.cc \			-I../../mercurial dirstate.cc \
	manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o \			manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o \
	$(LIB_FUZZING_ENGINE) `$$OUT/sanpy/bin/python-config --ldflags` \			$(LIB_FUZZING_ENGINE) `$(PYTHON_CONFIG) --ldflags` \
	-o $$OUT/dirstate_fuzzer			-o $$OUT/dirstate_fuzzer

	dirstate_corpus.zip:			dirstate_corpus.zip:
	python dirstate_corpus.py $$OUT/dirstate_fuzzer_seed_corpus.zip			python dirstate_corpus.py $$OUT/dirstate_fuzzer_seed_corpus.zip

	fm1readmarkers_fuzzer: fm1readmarkers.cc manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o			fm1readmarkers_fuzzer: fm1readmarkers.cc manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o
	$(CXX) $(CXXFLAGS) `$$OUT/sanpy/bin/python-config --cflags` \			$(CXX) $(CXXFLAGS) `$(PYTHON_CONFIG) --cflags` \
	-Wno-register -Wno-macro-redefined \			-Wno-register -Wno-macro-redefined \
	-I../../mercurial fm1readmarkers.cc \			-I../../mercurial fm1readmarkers.cc \
	manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o \			manifest.o charencode.o parsers.o dirs.o pathencode.o revlog.o pyutil.o \
	$(LIB_FUZZING_ENGINE) `$$OUT/sanpy/bin/python-config --ldflags` \			$(LIB_FUZZING_ENGINE) `$(PYTHON_CONFIG) --ldflags` \
	-o $$OUT/fm1readmarkers_fuzzer			-o $$OUT/fm1readmarkers_fuzzer

	fm1readmarkers_corpus.zip:			fm1readmarkers_corpus.zip:
	python fm1readmarkers_corpus.py $$OUT/fm1readmarkers_fuzzer_seed_corpus.zip			python fm1readmarkers_corpus.py $$OUT/fm1readmarkers_fuzzer_seed_corpus.zip

	clean:			clean:
	$(RM) .o _fuzzer \			$(RM) .o _fuzzer \
	bdiff \			bdiff \
	mpatch \			mpatch \
	xdiff			xdiff

	oss-fuzz: bdiff_fuzzer mpatch_fuzzer mpatch_corpus.zip xdiff_fuzzer dirs_fuzzer fncache_fuzzer jsonescapeu8fast_fuzzer manifest_fuzzer manifest_corpus.zip revlog_fuzzer revlog_corpus.zip dirstate_fuzzer dirstate_corpus.zip fm1readmarkers_fuzzer fm1readmarkers_corpus.zip			oss-fuzz: bdiff_fuzzer mpatch_fuzzer mpatch_corpus.zip xdiff_fuzzer dirs_fuzzer fncache_fuzzer jsonescapeu8fast_fuzzer manifest_fuzzer manifest_corpus.zip revlog_fuzzer revlog_corpus.zip dirstate_fuzzer dirstate_corpus.zip fm1readmarkers_fuzzer fm1readmarkers_corpus.zip

	.PHONY: all clean oss-fuzz			.PHONY: all clean oss-fuzz

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	18501		Dec 6 2019, 3:51 PM	★	★
Diff 2	18514	rHG4445e277506638c4dfedd4ad4bcbd0d441a1118e	Dec 6 2019, 3:15 PM	★	★