mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 06:25:31 +00:00
Code Issues Releases Wiki Activity

Merge branch '3926-dns_qp-fuzz-test-is-failing-to-build-under-clusterfuzz' into 'main'

Browse Source 
Remove unnecessary conditionals in fuzz/Makefile.am

Closes #3926

See merge request isc-projects/bind9!7649
This commit is contained in:
Mark Andrews
2023-03-29 03:20:03 +00:00
parent eeba1b8793 64c0065986
commit 9317aa9608
4 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@@ -3,9 +3,7 @@ include $(top_srcdir)/Makefile.top
SUBDIRS = . lib doc SUBDIRS = . lib doc
# build libtest before fuzz/* and bin/tests # build libtest before fuzz/* and bin/tests
if HAVE_CMOCKA
SUBDIRS += tests SUBDIRS += tests
endif HAVE_CMOCKA
# run fuzz tests before system tests # run fuzz tests before system tests
SUBDIRS += fuzz bin SUBDIRS += fuzz bin

34
fuzz/Makefile.am
View File

@@ -6,15 +6,19 @@ AM_CFLAGS += \
AM_CPPFLAGS += \ AM_CPPFLAGS += \
$(LIBISC_CFLAGS) \ $(LIBISC_CFLAGS) \
$(LIBDNS_CFLAGS) \ $(LIBDNS_CFLAGS) \
$(LIBUV_CFLAGS) \ $(LIBUV_CFLAGS) \
-DFUZZDIR=\"$(abs_srcdir)\" -DFUZZDIR=\"$(abs_srcdir)\" \
-I$(top_srcdir)/lib/dns \
-I$(top_srcdir)/lib/isc \
-I$(top_srcdir)/tests/include
AM_LDFLAGS += \ AM_LDFLAGS += \
$(FUZZ_LDFLAGS) $(FUZZ_LDFLAGS)
LDADD += \ LDADD += \
libfuzzmain.la \ libfuzzmain.la \
$(LIBDNS_LIBS) \ $(top_builddir)/tests/libtest/libtest.la \
$(LIBDNS_LIBS) \
$(LIBISC_LIBS) $(LIBISC_LIBS)
check_LTLIBRARIES = libfuzzmain.la check_LTLIBRARIES = libfuzzmain.la
@@ -28,6 +32,8 @@ check_PROGRAMS = \
dns_message_parse \ dns_message_parse \
dns_name_fromtext_target \ dns_name_fromtext_target \
dns_name_fromwire \ dns_name_fromwire \
dns_qp \
dns_qpkey_name \
dns_rdata_fromtext \ dns_rdata_fromtext \
dns_rdata_fromwire_text \ dns_rdata_fromwire_text \
isc_lex_getmastertoken \ isc_lex_getmastertoken \
@@ -51,24 +57,6 @@ dns_name_fromwire_SOURCES = \
old.c \ old.c \
old.h old.h
if HAVE_CMOCKA
check_PROGRAMS += \
dns_qp \
dns_qpkey_name
AM_CPPFLAGS += \
-I$(top_srcdir)/lib/dns \
-I$(top_srcdir)/lib/isc \
-I$(top_srcdir)/tests/include
# libisc needs to appear after libtest
LDADD += \
$(top_builddir)/tests/libtest/libtest.la \
$(LIBISC_LIBS)
endif HAVE_CMOCKA
TESTS = $(check_PROGRAMS) TESTS = $(check_PROGRAMS)
if HAVE_FUZZ_LOG_COMPILER if HAVE_FUZZ_LOG_COMPILER

6
tests/Makefile.am
View File

@@ -12,6 +12,10 @@ LDADD += \
$(LIBDNS_LIBS) \ $(LIBDNS_LIBS) \
$(LIBNS_LIBS) $(LIBNS_LIBS)
SUBDIRS = libtest isc dns ns isccfg irs bench SUBDIRS = libtest
if HAVE_CMOCKA
SUBDIRS += isc dns ns isccfg irs bench
endif HAVE_CMOCKA
check_PROGRAMS = check_PROGRAMS =

7
tests/libtest/Makefile.am
View File

@@ -16,13 +16,16 @@ LDADD += \
noinst_LTLIBRARIES = libtest.la noinst_LTLIBRARIES = libtest.la
libtest_la_SOURCES = \ libtest_la_SOURCES = \
../include/tests/dns.h \
../include/tests/isc.h \ ../include/tests/isc.h \
../include/tests/ns.h \ ../include/tests/ns.h \
../include/tests/qp.h \ ../include/tests/qp.h \
dns.c \
isc.c \ isc.c \
ns.c \ ns.c \
qp.c qp.c
if HAVE_CMOCKA
libtest_la_SOURCES += \
../include/tests/dns.h \
dns.c
endif HAVE_CMOCKA
include $(top_srcdir)/Makefile.tests include $(top_srcdir)/Makefile.tests