Commit 878f4225 authored by Richard Levitte's avatar Richard Levitte
Browse files

Make fuzzer and fuzz tester builds less magic 



Instead of having fuzz/build.info.fuzz magically and conditionally
included along with the other build.info files, incorporate it in
fuzz/build.info and add the conditions there instead.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 563c1ec6

Configure

+0 −3
Original line number Diff line number Diff line
@@ -1336,9 +1336,6 @@ if ($builder eq "unified") { 
    }



    my @build_infos = ( [ ".", "build.info" ] );

    push @build_infos, [ "fuzz", "build.info.fuzz" ]

        unless $disabled{"fuzz-afl"} && $disabled{"fuzz-libfuzzer"};



    foreach (@{$config{dirs}}) {

        push @build_infos, [ $_, "build.info" ]

            if (-f catfile($srcdir, $_, "build.info"));

fuzz/build.info

+87 −32
Original line number Diff line number Diff line 
{- use File::Spec::Functions qw/catdir rel2abs/; -}

{- use File::Spec::Functions;

   our $ex_inc = $withargs{fuzzer_include} &&

       (file_name_is_absolute($withargs{fuzzer_include}) ?

        $withargs{fuzzer_include} : catdir(updir(), $withargs{fuzzer_include}));

   our $ex_lib = $withargs{fuzzer_lib} &&

       (file_name_is_absolute($withargs{fuzzer_lib}) ?

        $withargs{fuzzer_lib} : catfile(updir(), $withargs{fuzzer_lib}));

   ""

-}



IF[{- !$disabled{"fuzz-afl"} || !$disabled{"fuzz-libfuzzer"} -}]

  PROGRAMS=asn1 asn1parse bignum bndiv cms conf crl ct server x509



  SOURCE[asn1]=asn1.c driver.c

  INCLUDE[asn1]=../include {- $ex_inc -}

  DEPEND[asn1]=../libcrypto {- $ex_lib -}



  SOURCE[asn1parse]=asn1parse.c driver.c

  INCLUDE[asn1parse]=../include {- $ex_inc -}

  DEPEND[asn1parse]=../libcrypto {- $ex_lib -}



  SOURCE[bignum]=bignum.c driver.c

  INCLUDE[bignum]=../include {- $ex_inc -}

  DEPEND[bignum]=../libcrypto {- $ex_lib -}



  SOURCE[bndiv]=bndiv.c driver.c

  INCLUDE[bndiv]=../include {- $ex_inc -}

  DEPEND[bndiv]=../libcrypto {- $ex_lib -}



  SOURCE[cms]=cms.c driver.c

  INCLUDE[cms]=../include {- $ex_inc -}

  DEPEND[cms]=../libcrypto {- $ex_lib -}



  SOURCE[conf]=conf.c driver.c

  INCLUDE[conf]=../include {- $ex_inc -}

  DEPEND[conf]=../libcrypto {- $ex_lib -}



  SOURCE[crl]=crl.c driver.c

  INCLUDE[crl]=../include {- $ex_inc -}

  DEPEND[crl]=../libcrypto {- $ex_lib -}



  SOURCE[ct]=ct.c driver.c

  INCLUDE[ct]=../include {- $ex_inc -}

  DEPEND[ct]=../libcrypto {- $ex_lib -}



  SOURCE[server]=server.c driver.c

  INCLUDE[server]=../include {- $ex_inc -}

  DEPEND[server]=../libcrypto ../libssl {- $ex_lib -}



  SOURCE[x509]=x509.c driver.c

  INCLUDE[x509]=../include {- $ex_inc -}

  DEPEND[x509]=../libcrypto {- $ex_lib -}

ENDIF



IF[{- !$disabled{tests} -}]

  PROGRAMS=asn1-test asn1parse-test bignum-test bndiv-test cms-test conf-test crl-test ct-test server-test x509-test



  SOURCE[asn1-test]=asn1.c test-corpus.c
@@ -40,3 +94,4 @@ DEPEND[server-test]=../libcrypto ../libssl 
  SOURCE[x509-test]=x509.c test-corpus.c

  INCLUDE[x509-test]=../include

  DEPEND[x509-test]=../libcrypto

ENDIF

fuzz/build.info.fuzz

deleted100644 → 0
+0 −51
Original line number Diff line number Diff line 
{- use File::Spec::Functions;

   our $ex_inc = $withargs{fuzzer_include} &&

       (file_name_is_absolute($withargs{fuzzer_include}) ?

        $withargs{fuzzer_include} : catdir(updir(), $withargs{fuzzer_include}));

   our $ex_lib = $withargs{fuzzer_lib} &&

       (file_name_is_absolute($withargs{fuzzer_lib}) ?

        $withargs{fuzzer_lib} : catfile(updir(), $withargs{fuzzer_lib}));

   ""

-}



PROGRAMS=asn1 asn1parse bignum bndiv cms conf crl ct server x509



SOURCE[asn1]=asn1.c driver.c

INCLUDE[asn1]=../include {- $ex_inc -}

DEPEND[asn1]=../libcrypto {- $ex_lib -}



SOURCE[asn1parse]=asn1parse.c driver.c

INCLUDE[asn1parse]=../include {- $ex_inc -}

DEPEND[asn1parse]=../libcrypto {- $ex_lib -}



SOURCE[bignum]=bignum.c driver.c

INCLUDE[bignum]=../include {- $ex_inc -}

DEPEND[bignum]=../libcrypto {- $ex_lib -}



SOURCE[bndiv]=bndiv.c driver.c

INCLUDE[bndiv]=../include {- $ex_inc -}

DEPEND[bndiv]=../libcrypto {- $ex_lib -}



SOURCE[cms]=cms.c driver.c

INCLUDE[cms]=../include {- $ex_inc -}

DEPEND[cms]=../libcrypto {- $ex_lib -}



SOURCE[conf]=conf.c driver.c

INCLUDE[conf]=../include {- $ex_inc -}

DEPEND[conf]=../libcrypto {- $ex_lib -}



SOURCE[crl]=crl.c driver.c

INCLUDE[crl]=../include {- $ex_inc -}

DEPEND[crl]=../libcrypto {- $ex_lib -}



SOURCE[ct]=ct.c driver.c

INCLUDE[ct]=../include {- $ex_inc -}

DEPEND[ct]=../libcrypto {- $ex_lib -}



SOURCE[server]=server.c driver.c

INCLUDE[server]=../include {- $ex_inc -}

DEPEND[server]=../libcrypto ../libssl {- $ex_lib -}



SOURCE[x509]=x509.c driver.c

INCLUDE[x509]=../include {- $ex_inc -}

DEPEND[x509]=../libcrypto {- $ex_lib -}