Merge commit '286ab878bd39b56008035638227b3ecb8ec5bbb7'
authorJames Almer <jamrial@gmail.com>
Tue, 4 Apr 2017 18:03:34 +0000 (15:03 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 4 Apr 2017 18:03:34 +0000 (15:03 -0300)
* commit '286ab878bd39b56008035638227b3ecb8ec5bbb7':
  fate.sh: Allow setting other make flags for running tests

Merged-by: James Almer <jamrial@gmail.com>
1  2 
doc/fate_config.sh.template
tests/fate.sh

index 059a1f8,0000000..56acb26
mode 100644,000000..100644
--- /dev/null
@@@ -1,30 -1,0 +1,32 @@@
 +slot=                                    # some unique identifier
 +repo=git://source.ffmpeg.org/ffmpeg.git  # the source repository
 +#branch=release/2.6                       # the branch to test
 +samples=                                 # path to samples directory
 +workdir=                                 # directory in which to do all the work
 +#fate_recv="ssh -T fate@fate.ffmpeg.org" # command to submit report
 +comment=                                 # optional description
 +build_only=     # set to "yes" for a compile-only instance that skips tests
 +
 +# the following are optional and map to configure options
 +arch=
 +cpu=
 +cross_prefix=
 +as=
 +cc=
 +ld=
 +target_os=
 +sysroot=
 +target_exec=
 +target_path=
 +target_samples=
 +extra_cflags=
 +extra_ldflags=
 +extra_libs=
 +extra_conf=     # extra configure options not covered above
 +
 +#make=          # name of GNU make if not 'make'
 +makeopts=       # extra options passed to 'make'
++#makeopts_fate= # extra options passed to 'make' when running tests,
++                # defaulting to makeopts above if this is not set
 +#tar=           # command to create a tar archive from its arguments on stdout,
 +                # defaults to 'tar c'
diff --cc tests/fate.sh
Simple merge