File tree Expand file tree Collapse file tree 3 files changed +11
-1
lines changed Expand file tree Collapse file tree 3 files changed +11
-1
lines changed Original file line number Diff line number Diff line change @@ -40,6 +40,8 @@ foreach (@ARGV) {
4040 $args .= " --tools " ;
4141 } elsif (/ ^--fuzz-corpora$ / ) {
4242 $args .= " --fuzz-corpora " ;
43+ } elsif (/ ^--perftools$ / ) {
44+ $args .= " --perftools " ;
4345 } elsif (/ ^--verbose$ / ) {
4446 $args .= " --verbose " ;
4547 } elsif (/ ^--noself$ / ) {
Original file line number Diff line number Diff line change @@ -10,6 +10,7 @@ Option style arguments:
1010--help Print this help and exit
1111--tools Merge a tools PR (rather than openssl PR)
1212--web Merge a web PR (rather than openssl PR)
13+ --perftools Merge a perftools PR (rather than openssl PR)
1314--fuzz-corpora Merge a PR against fuzz-corpora (rather than openssl PR)
1415--remote <remote> Repo to merge with (rather than git.openssl.org), usually 'upstream'
1516--target <branch> Merge target (rather than current branch), usually 'master'
@@ -28,7 +29,6 @@ Examples:
2829 ghmerge --nobuild --target openssl-3.0 --cherry-pick 3 16051 paulidale"
2930 exit 9
3031}
31-
3232set -o errexit
3333
3434WHAT=" "
@@ -61,6 +61,9 @@ while [ $# -ne 0 ]; do
6161 --web)
6262 WHAT=web ; BUILD=no ; shift
6363 ;;
64+ --perftools)
65+ WHAT=perftools; BUILD=no; shift
66+ ;;
6467 --technical-policies)
6568 WHAT=technical-policies ; BUILD=no ; shift
6669 ;;
Original file line number Diff line number Diff line change @@ -146,6 +146,11 @@ foreach (@ARGV) {
146146 # openssl/fuzz-corpora is governed by OTC
147147 $min_otc = 1;
148148 $min_omc = 0;
149+ } elsif (/ --perftools$ / ) {
150+ $WHAT = ' perftools' ;
151+ $min_authors = 2;
152+ $min_otc = 0;
153+ $min_omc = 0;
149154 } elsif (/ ^--release$ / ) {
150155 $release = 1;
151156 }
You can’t perform that action at this time.
0 commit comments