diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-03-09 10:24:22 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-03-09 20:28:00 +0000 |
| commit | 3b7054e0bb86cec2db08b7c7654710a21cf66a94 (patch) | |
| tree | 41487f48740f017520e32a216ae05ffcc5f573e7 | |
| parent | a831608576f5411e143bb09b5d135fe3d1bfda8f (diff) | |
use a different resource dir for oss-fuzz
This reverts commit 754854674859560506b617ebf07e6563c197aac8.
Change-Id: I0863fb5e34608911c784bbdf19e76297b3c2d13e
| -rwxr-xr-x | bin/oss-fuzz-build.sh | 7 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh index 2c54e13e392b..b0d3d6eb201a 100755 --- a/bin/oss-fuzz-build.sh +++ b/bin/oss-fuzz-build.sh @@ -24,10 +24,13 @@ make fuzzers cp $SRC/libreoffice/extras/source/truetype/symbol/opens___.ttf instdir/share/fonts/truetype/Liberation* $OUT #minimal runtime requirements rm -rf $OUT/services $OUT/types $OUT/resource $OUT/*rdb -pushd instdir/program -cp -r *fuzzer *rc *rdb services types resource $OUT +pushd instdir +cp -r resource $OUT +pushd program +cp -r *fuzzer *rc *rdb services types $OUT mv $OUT/services/services.rdb $OUT/services.rdb popd +popd #starting corpuses cp $SRC/*_seed_corpus.zip $OUT diff --git a/configure.ac b/configure.ac index fb4441c06267..dd945c927dad 100644 --- a/configure.ac +++ b/configure.ac @@ -3129,7 +3129,11 @@ else LIBO_SHARE_JAVA_FOLDER=program/classes LIBO_SHARE_PRESETS_FOLDER=presets LIBO_SHARE_READMES_FOLDER=readmes - LIBO_SHARE_RESOURCE_FOLDER=program/resource + if test "$enable_fuzzers" != yes; then + LIBO_SHARE_RESOURCE_FOLDER=program/resource + else + LIBO_SHARE_RESOURCE_FOLDER=resource + fi LIBO_SHARE_SHELL_FOLDER=program/shell LIBO_URE_BIN_FOLDER=program LIBO_URE_ETC_FOLDER=program |