Commit 54e75be4 authored by Diego Biurrun's avatar Diego Biurrun

configure: refactor lists of tests and components into variables

parent 11b1db27
...@@ -1748,6 +1748,20 @@ INDEV_LIST=$(find_things indev _IN libavdevice/alldevices.c) ...@@ -1748,6 +1748,20 @@ INDEV_LIST=$(find_things indev _IN libavdevice/alldevices.c)
PROTOCOL_LIST=$(find_things protocol PROTOCOL libavformat/allformats.c) PROTOCOL_LIST=$(find_things protocol PROTOCOL libavformat/allformats.c)
FILTER_LIST=$(find_things filter FILTER libavfilter/allfilters.c) FILTER_LIST=$(find_things filter FILTER libavfilter/allfilters.c)
ALL_COMPONENTS="
$BSF_LIST
$DECODER_LIST
$DEMUXER_LIST
$ENCODER_LIST
$FILTER_LIST
$HWACCEL_LIST
$INDEV_LIST
$MUXER_LIST
$OUTDEV_LIST
$PARSER_LIST
$PROTOCOL_LIST
"
find_tests(){ find_tests(){
map "echo ${2}\${v}_test" $(ls "$source_path"/tests/ref/$1 | grep -v '[^-a-z0-9_]') map "echo ${2}\${v}_test" $(ls "$source_path"/tests/ref/$1 | grep -v '[^-a-z0-9_]')
} }
...@@ -1758,6 +1772,8 @@ LAVF_TESTS=$(find_tests lavf) ...@@ -1758,6 +1772,8 @@ LAVF_TESTS=$(find_tests lavf)
LAVFI_TESTS=$(find_tests lavfi) LAVFI_TESTS=$(find_tests lavfi)
SEEK_TESTS=$(find_tests seek seek_) SEEK_TESTS=$(find_tests seek seek_)
ALL_TESTS="$ACODEC_TESTS $VCODEC_TESTS $LAVF_TESTS $LAVFI_TESTS $SEEK_TESTS"
pcm_test_deps=$(map 'echo ${v%_*}_decoder $v' $(filter pcm_* $ENCODER_LIST)) pcm_test_deps=$(map 'echo ${v%_*}_decoder $v' $(filter pcm_* $ENCODER_LIST))
for n in $COMPONENT_LIST; do for n in $COMPONENT_LIST; do
...@@ -1766,7 +1782,7 @@ for n in $COMPONENT_LIST; do ...@@ -1766,7 +1782,7 @@ for n in $COMPONENT_LIST; do
eval ${n}_if_any="\$$v" eval ${n}_if_any="\$$v"
done done
enable $ARCH_EXT_LIST $ACODEC_TESTS $VCODEC_TESTS $LAVF_TESTS $LAVFI_TESTS $SEEK_TESTS enable $ARCH_EXT_LIST $ALL_TESTS
die_unknown(){ die_unknown(){
echo "Unknown option \"$1\"." echo "Unknown option \"$1\"."
...@@ -3119,22 +3135,8 @@ enabled_any $THREADS_LIST && enable threads ...@@ -3119,22 +3135,8 @@ enabled_any $THREADS_LIST && enable threads
check_deps $CONFIG_LIST \ check_deps $CONFIG_LIST \
$CONFIG_EXTRA \ $CONFIG_EXTRA \
$HAVE_LIST \ $HAVE_LIST \
$DECODER_LIST \ $ALL_COMPONENTS \
$ENCODER_LIST \ $ALL_TESTS \
$HWACCEL_LIST \
$PARSER_LIST \
$BSF_LIST \
$DEMUXER_LIST \
$MUXER_LIST \
$FILTER_LIST \
$INDEV_LIST \
$OUTDEV_LIST \
$PROTOCOL_LIST \
$ACODEC_TESTS \
$VCODEC_TESTS \
$LAVF_TESTS \
$LAVFI_TESTS \
$SEEK_TESTS \
enabled asm || { arch=c; disable $ARCH_LIST $ARCH_EXT_LIST; } enabled asm || { arch=c; disable $ARCH_LIST $ARCH_EXT_LIST; }
...@@ -3382,17 +3384,7 @@ print_config ARCH_ "$config_files" $ARCH_LIST ...@@ -3382,17 +3384,7 @@ print_config ARCH_ "$config_files" $ARCH_LIST
print_config HAVE_ "$config_files" $HAVE_LIST print_config HAVE_ "$config_files" $HAVE_LIST
print_config CONFIG_ "$config_files" $CONFIG_LIST \ print_config CONFIG_ "$config_files" $CONFIG_LIST \
$CONFIG_EXTRA \ $CONFIG_EXTRA \
$DECODER_LIST \ $ALL_COMPONENTS \
$ENCODER_LIST \
$HWACCEL_LIST \
$PARSER_LIST \
$BSF_LIST \
$DEMUXER_LIST \
$MUXER_LIST \
$FILTER_LIST \
$PROTOCOL_LIST \
$INDEV_LIST \
$OUTDEV_LIST \
cat >>config.mak <<EOF cat >>config.mak <<EOF
ACODEC_TESTS=$(print_enabled -n _test $ACODEC_TESTS) ACODEC_TESTS=$(print_enabled -n _test $ACODEC_TESTS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment