Merge commit '9510d7689e236f6a4748795604fba427c130d0ad'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Oct 2013 20:45:18 +0000 (21:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Oct 2013 20:50:49 +0000 (21:50 +0100)
* commit '9510d7689e236f6a4748795604fba427c130d0ad':
  fate.sh: Allow non-fast-forwards when updating sources

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
tests/fate.sh

diff --combined tests/fate.sh
@@@ -35,18 -35,16 +35,18 @@@ checkout()
  update()(
      cd ${src} || return
      case "$repo" in
-         git:*) git pull --quiet ;;
+         git:*) git fetch --force; git reset --hard origin/master ;;
      esac
  )
  
  configure()(
      cd ${build} || return
 -    ${src}/configure                                                    \
 +    ${shell} ${src}/configure                                           \
          --prefix="${inst}"                                              \
          --samples="${samples}"                                          \
          --enable-gpl                                                    \
 +        --enable-memory-poisoning                                       \
 +        --enable-avresample                                             \
          ${arch:+--arch=$arch}                                           \
          ${cpu:+--cpu="$cpu"}                                            \
          ${cross_prefix:+--cross-prefix="$cross_prefix"}                 \