Add fuzz-corpora to review-tools

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/tools/pull/143)

diff --git a/review-tools/addrev b/review-tools/addrev
index 5fe44259ffc30fac39b35682e8607495f111095a..984ddf23c98a663fa25f95fd994b7a66a36a3197 100755 (executable)
--- a/review-tools/addrev
+++ b/review-tools/addrev
@@ -36,6 +36,8 @@ foreach (@ARGV) {
         $args .= "--web ";
     } elsif (/^--tools$/) {
         $args .= "--tools ";
+    } elsif (/^--fuzz-corpora$/) {
+        $args .= "--fuzz-corpora ";
     } elsif (/^--verbose$/) {
         $args .= "--verbose ";
     } elsif (/^--noself$/) {

diff --git a/review-tools/ghmerge b/review-tools/ghmerge
index 7a8fae15470c80972d68359365d7f32bc8d06580..41e3faefd6a350972ce8a86bc1ff3171ca52f331 100755 (executable)
--- a/review-tools/ghmerge
+++ b/review-tools/ghmerge
@@ -10,6 +10,7 @@ Option style arguments:
 --help              Print this help and exit
 --tools             Merge a tools PR (rather than openssl PR)
 --web               Merge a web PR (rather than openssl PR)
+--fuzz-corpora      Merge a PR against fuzz-corpora (rather than openssl PR)
 --remote <remote>   Repo to merge with (rather than git.openssl.org), usually 'upstream'
 --target <branch>   Merge target (rather than current branch), usually 'master'
 --ref <branch>      A synonym for --target
@@ -60,6 +61,9 @@ while [ $# -ne 0 ]; do
     --web)
         WHAT=web ; BUILD=no ; shift
         ;;
+    --fuzz-corpora)
+        WHAT=fuzz-corpora ; BUILD=no ; shift
+        ;;
     --cherry-pick)
         shift;
         PICK=1;

diff --git a/review-tools/gitaddrev b/review-tools/gitaddrev
index 8e5a4218482b08573050ff6912498d5901fd0664..e5e889d8dd6d46f5d201415099bae6356c6b1bc2 100755 (executable)
--- a/review-tools/gitaddrev
+++ b/review-tools/gitaddrev
@@ -140,6 +140,12 @@ foreach (@ARGV) {
         # openssl/tools is governed by OTC
         $min_otc = 2;
         $min_omc = 0;
+    } elsif (/--fuzz-corpora$/) {
+        $WHAT = 'fuzz-corpora';
+        $min_authors = 1;
+        # openssl/fuzz-corpora is governed by OTC
+        $min_otc = 1;
+        $min_omc = 0;
     } elsif (/^--release$/) {
         $release = 1;
     }