diff options
| author | Robert Löhning <robert.loehning@qt.io> | 2020-02-13 19:34:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-13 10:34:12 -0800 |
| commit | b911bfc78b631a0160235cf68cbd0442ec2d6f5c (patch) | |
| tree | 3e7d24dd38048ccd504d42226de0c6ba026c6adb /projects/qt | |
| parent | dfaf951f35bd33f95b8105d5572eaeb29305d529 (diff) | |
| download | oss-fuzz-b911bfc78b631a0160235cf68cbd0442ec2d6f5c.tar.gz | |
[qt] Change pro-file names to lower case (#3381)
* [qt] Change pro-file names to lower case
Don't change the names of resulting
executables to keep track of open issues.
* [qt] Fix workaround
* [qt] Another fix in the workaround
Diffstat (limited to 'projects/qt')
| -rw-r--r-- | projects/qt/Dockerfile | 7 | ||||
| -rwxr-xr-x | projects/qt/build.sh | 18 |
2 files changed, 22 insertions, 3 deletions
diff --git a/projects/qt/Dockerfile b/projects/qt/Dockerfile index 4b0dbf968..dd7f2d8ea 100644 --- a/projects/qt/Dockerfile +++ b/projects/qt/Dockerfile @@ -20,6 +20,13 @@ RUN apt-get update && apt-get install -y build-essential python libxcb-xinerama0 RUN git clone --branch 5.15 --depth 1 git://code.qt.io/qt/qt5.git qt WORKDIR qt RUN perl init-repository --module-subset=qtbase + +# bring forward renaming of source files, so I won't get suprised +WORKDIR qtbase +RUN git config user.name qt-local +RUN git config user.email qt-local@oss-fuzz +RUN git fetch "https://codereview.qt-project.org/qt/qtbase" refs/changes/21/288521/1 && git cherry-pick FETCH_HEAD + WORKDIR $SRC RUN git clone --depth 1 git://code.qt.io/qt/qtqa.git COPY build.sh $SRC/ diff --git a/projects/qt/build.sh b/projects/qt/build.sh index 076a73c9c..3e83f588f 100755 --- a/projects/qt/build.sh +++ b/projects/qt/build.sh @@ -47,6 +47,18 @@ build_fuzzer() { cd build_fuzzer $WORK/qtbase/bin/qmake $SRC/qt/$module/tests/libfuzzer/$proFilePath make -j$(nproc) + + # use old names of fuzzers, so open issues don't change state accidentally + local lowercaseExeName=$exeName + if [ "$exeName" == "setmarkdown" ]; then + exeName=setMarkdown + elif [ "$exeName" == "beginlayout" ]; then + exeName=beginLayout + fi + if [ "$lowercaseExeName" != "$exeName" ]; then + mv $lowercaseExeName $exeName + fi + mv $exeName $OUT if [ -n "$format" ]; then cp $WORK/$format.zip $OUT/"$exeName"_seed_corpus.zip @@ -59,6 +71,6 @@ build_fuzzer() { } build_fuzzer "qtbase" "corelib/serialization/qxmlstream/qxmlstreamreader/readnext/readnext.pro" "xml" "/usr/share/afl/testcases/_extras/xml.dict" -# build_fuzzer "qtbase" "gui/text/qtextdocument/setHtml/setHtml.pro" "html" "/usr/share/afl/testcases/_extras/html_tags.dict" -build_fuzzer "qtbase" "gui/text/qtextdocument/setMarkdown/setMarkdown.pro" "markdown" -build_fuzzer "qtbase" "gui/text/qtextlayout/beginLayout/beginLayout.pro" +# build_fuzzer "qtbase" "gui/text/qtextdocument/sethtml/sethtml.pro" "html" "/usr/share/afl/testcases/_extras/html_tags.dict" +build_fuzzer "qtbase" "gui/text/qtextdocument/setmarkdown/setmarkdown.pro" "markdown" +build_fuzzer "qtbase" "gui/text/qtextlayout/beginlayout/beginlayout.pro" |