Skip to content

Commit

Permalink
fuzz: Move the directory out of build/
Browse files Browse the repository at this point in the history
The "build/" directory is mainly used for the artifacts not shipped in
the distribution (except "build/litter" and "build/m4", which are
populated by autotools).
  • Loading branch information
ueno committed Feb 8, 2021
1 parent 6aa3ce1 commit 3e7451e
Show file tree
Hide file tree
Showing 124 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ bashcomp_DATA =

include common/Makefile.am
include p11-kit/Makefile.am
include build/fuzz/Makefile.am
include fuzz/Makefile.am

if WITH_TRUST_MODULE
include trust/Makefile.am
Expand Down
10 changes: 5 additions & 5 deletions build/fuzz/Makefile.am → fuzz/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
fuzz_targets = build/fuzz/rpc_fuzzer
fuzz_targets = fuzz/rpc_fuzzer
check_PROGRAMS += $(fuzz_targets)
fuzz: $(fuzz_targets)

build_fuzz_rpc_fuzzer_SOURCES = build/fuzz/rpc_fuzzer.c build/fuzz/fuzz.h build/fuzz/main.c
fuzz_rpc_fuzzer_SOURCES = fuzz/rpc_fuzzer.c fuzz/fuzz.h fuzz/main.c

build_fuzz_rpc_fuzzer_LDADD = libp11-kit-testable.la libp11-test.la libp11-common.la
fuzz_rpc_fuzzer_LDADD = libp11-kit-testable.la libp11-test.la libp11-common.la

oss-fuzz: libp11-kit-testable.la libp11-test.la libp11-common.la
if test "$$OUT" != ""; then \
for src_file in $(top_srcdir)/build/fuzz/*_fuzzer.c; do \
for src_file in $(top_srcdir)/fuzz/*_fuzzer.c; do \
fuzzer=$$(basename $$src_file .c); \
$$CC $$CFLAGS -I. -I$(top_srcdir) -I$(top_srcdir)/common \
-c $(top_srcdir)"/build/fuzz/$${fuzzer}.c" -o "$${fuzzer}.o" ; \
-c $(top_srcdir)"/fuzz/$${fuzzer}.c" -o "$${fuzzer}.o" ; \
$$CXX $$CXXFLAGS "$${fuzzer}.o" -o "$$OUT/$${fuzzer}" \
.libs/libp11-kit-testable.a .libs/libp11-test.a .libs/libp11-common.a \
-lffi -ldl -lpthread $${LIB_FUZZING_ENGINE} || exit $?; \
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion build/fuzz/rpc_fuzzer.c → fuzz/rpc_fuzzer.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "config.h"
#include "test.h"

#include "build/fuzz/fuzz.h"
#include "fuzz/fuzz.h"
#include "library.h"
#include "mock.h"
#include "p11-kit/rpc.h"
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ pkg = import('pkgconfig')

subdir('common')
subdir('p11-kit')
subdir('build/fuzz')
subdir('fuzz')
if with_trust_module
subdir('trust')
endif
Expand Down

0 comments on commit 3e7451e

Please sign in to comment.