From: Tom Finegan <tomfinegan@google.com>
Date: Thu, 24 Apr 2014 00:18:56 +0000 (-0700)
Subject: Move shared test variables to tools_common.sh.
X-Git-Tag: v1.4.0~1727^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7da552c28324773b1d8afe12a519b9fcd6dc270f;p=libvpx

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
---

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.