aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2012-05-20 16:10:42 +0200
committerDiego Biurrun <diego@biurrun.de>2012-05-21 08:51:49 +0200
commit9309bdfe2ce59aa047b9a25e70a948c7ca9e8b76 (patch)
tree6047396680386a3462171d0cb89e3ed95f6f2922
parente9cef89702e2bde918102e784c6b75a7979e85d1 (diff)
downloadffmpeg-9309bdfe2ce59aa047b9a25e70a948c7ca9e8b76.tar.gz
fate: change name of FATE samples location environment variable
FATE_SAMPLES is now used directly by the Makefiles, which induces the test system to run a test with the value of the environment variable as name. Renaming the environment variable to LIBAV_SAMPLES avoids this problem.
-rwxr-xr-xconfigure4
-rw-r--r--doc/fate.texi2
2 files changed, 3 insertions, 3 deletions
diff --git a/configure b/configure
index f6cb0e2558..b81394d3c2 100755
--- a/configure
+++ b/configure
@@ -258,7 +258,7 @@ Developer options (useful when working on Libav itself):
--disable-optimizations disable compiler optimizations
--enable-extra-warnings enable more compiler warnings
--samples=PATH location of test samples for FATE, if not set use
- \$FATE_SAMPLES at make invocation time.
+ \$LIBAV_SAMPLES at make invocation time.
--enable-xmm-clobber-test check XMM registers for clobbering (Win64-only;
should be used only for debugging purposes)
@@ -3374,7 +3374,7 @@ SLIB_INSTALL_NAME=${SLIB_INSTALL_NAME}
SLIB_INSTALL_LINKS=${SLIB_INSTALL_LINKS}
SLIB_INSTALL_EXTRA_LIB=${SLIB_INSTALL_EXTRA_LIB}
SLIB_INSTALL_EXTRA_SHLIB=${SLIB_INSTALL_EXTRA_SHLIB}
-SAMPLES:=${samples:-\$(FATE_SAMPLES)}
+SAMPLES:=${samples:-\$(LIBAV_SAMPLES)}
EOF
get_version(){
diff --git a/doc/fate.texi b/doc/fate.texi
index 5489d95133..b69301ac84 100644
--- a/doc/fate.texi
+++ b/doc/fate.texi
@@ -26,7 +26,7 @@ that is provided separately from the actual source distribution.
To inform the build system about the testsuite location, pass
@option{--samples=<path to the samples>} to @command{configure} or set the
-@var{SAMPLES} Make variable or the @var{FATE_SAMPLES} environment variable
+@var{SAMPLES} Make variable or the @var{LIBAV_SAMPLES} environment variable
to a suitable value.
The dataset is available through @command{rsync}, is possible to fetch