From 7da552c28324773b1d8afe12a519b9fcd6dc270f Mon Sep 17 00:00:00 2001
From: Tom Finegan <tomfinegan@google.com>
Date: Wed, 23 Apr 2014 17:18:56 -0700
Subject: [PATCH] Move shared test variables to tools_common.sh.
The global variables used in vpxdec.sh and vpxenc.sh have become useful
elsewhere: Define them in tools_common.sh instead.
Change-Id: I5b8dbd2e88c8d6b2f46c5c55d7711fa154c12b6a
---
test/tools_common.sh | 11 +++++++++++
test/vpxdec.sh | 3 ---
test/vpxenc.sh | 3 ---
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/test/tools_common.sh b/test/tools_common.sh
index aa446c9c2f..45b7771786 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 d236f973b8..093230b694 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 89e4eb39c8..f08c048785 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.
--
GitLab