diff options
| author | Tom Finegan <tomfinegan@google.com> | 2014-04-24 11:12:44 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-04-24 11:12:44 -0700 |
| commit | b906fe6528fd783fdeef63896cd8141b851deb89 (patch) | |
| tree | 22bdba5ed2a8c9785bc88a0699872e218b261486 /test | |
| parent | b933205a0281ed8830017a96f70402bc3dcffb11 (diff) | |
| parent | 7da552c28324773b1d8afe12a519b9fcd6dc270f (diff) | |
| download | libvpx-b906fe6528fd783fdeef63896cd8141b851deb89.tar libvpx-b906fe6528fd783fdeef63896cd8141b851deb89.tar.gz libvpx-b906fe6528fd783fdeef63896cd8141b851deb89.tar.bz2 libvpx-b906fe6528fd783fdeef63896cd8141b851deb89.zip | |
Merge "Move shared test variables to tools_common.sh."
Diffstat (limited to 'test')
| -rwxr-xr-x | test/tools_common.sh | 11 | ||||
| -rwxr-xr-x | test/vpxdec.sh | 3 | ||||
| -rwxr-xr-x | test/vpxenc.sh | 3 |
3 files changed, 11 insertions, 6 deletions
diff --git a/test/tools_common.sh b/test/tools_common.sh index aa446c9c2..45b777178 100755 --- a/test/tools_common.sh +++ b/test/tools_common.sh @@ -416,6 +416,17 @@ if [ "$(is_windows_target)" = "yes" ]; then VPX_TEST_EXE_SUFFIX=".exe" fi +# Variables shared by tests. +VP8_IVF_FILE="${LIBVPX_TEST_DATA_PATH}/vp80-00-comprehensive-001.ivf" +VP9_IVF_FILE="${LIBVPX_TEST_DATA_PATH}/vp90-2-09-subpixel-00.ivf" + +VP9_WEBM_FILE="${LIBVPX_TEST_DATA_PATH}/vp90-2-00-quantizer-00.webm" + +YUV_RAW_INPUT="${LIBVPX_TEST_DATA_PATH}/hantro_collage_w352h288.yuv" +YUV_RAW_INPUT_WIDTH=352 +YUV_RAW_INPUT_HEIGHT=288 + +# Setup a trap function to clean up after tests complete. trap cleanup EXIT if [ "${VPX_TEST_VERBOSE_OUTPUT}" = "yes" ]; then diff --git a/test/vpxdec.sh b/test/vpxdec.sh index d236f973b..093230b69 100755 --- a/test/vpxdec.sh +++ b/test/vpxdec.sh @@ -14,9 +14,6 @@ ## . $(dirname $0)/tools_common.sh -VP8_IVF_FILE="${LIBVPX_TEST_DATA_PATH}/vp80-00-comprehensive-001.ivf" -VP9_WEBM_FILE="${LIBVPX_TEST_DATA_PATH}/vp90-2-00-quantizer-00.webm" - # Environment check: Make sure input is available. vpxdec_verify_environment() { if [ ! -e "${VP8_IVF_FILE}" ] || [ ! -e "${VP9_WEBM_FILE}" ]; then diff --git a/test/vpxenc.sh b/test/vpxenc.sh index 89e4eb39c..f08c04878 100755 --- a/test/vpxenc.sh +++ b/test/vpxenc.sh @@ -15,9 +15,6 @@ ## . $(dirname $0)/tools_common.sh -YUV_RAW_INPUT="${LIBVPX_TEST_DATA_PATH}/hantro_collage_w352h288.yuv" -YUV_RAW_INPUT_WIDTH=352 -YUV_RAW_INPUT_HEIGHT=288 TEST_FRAMES=10 # Environment check: Make sure input is available. |