shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "example tests: Make failures due to incorrect bin path easier to diagnose."

--- a/test/decode_to_md5.sh

+++ b/test/decode_to_md5.sh

@@ -34,7 +34,10 @@

   local expected_md5="$3"

   local output_file="${VPX_TEST_OUTPUT_DIR}/decode_to_md5_${codec}"

-  [ -x "${decoder}" ] || return 1

+  if [ ! -x "${decoder}" ]; then

+    elog "${decoder} does not exist or is not executable."

+    return 1

+  fi

   eval "${decoder}" "${input_file}" "${output_file}" ${devnull}

--- a/test/decode_with_drops.sh

+++ b/test/decode_with_drops.sh

@@ -34,7 +34,10 @@

   local output_file="${VPX_TEST_OUTPUT_DIR}/decode_with_drops_${codec}"

   local drop_mode="$3"

-  [ -x "${decoder}" ] || return 1

+  if [ ! -x "${decoder}" ]; then

+    elog "${decoder} does not exist or is not executable."

+    return 1

+  fi

   eval "${decoder}" "${input_file}" "${output_file}" "${drop_mode}" ${devnull}

--- a/test/postproc.sh

+++ b/test/postproc.sh

@@ -32,7 +32,10 @@

   local codec="$2"

   local output_file="${VPX_TEST_OUTPUT_DIR}/postproc_${codec}.raw"

-  [ -x "${decoder}" ] || return 1

+  if [ ! -x "${decoder}" ]; then

+    elog "${decoder} does not exist or is not executable."

+    return 1

+  fi

   eval "${decoder}" "${input_file}" "${output_file}" ${devnull}

--- a/test/resize_util.sh

+++ b/test/resize_util.sh

@@ -33,7 +33,10 @@

   # resize_util is available only when CONFIG_SHARED is disabled.

   if [ -z "$(vpx_config_option_enabled CONFIG_SHARED)" ]; then

-    [ -x "${resizer}" ] || return 1

+    if [ ! -x "${resizer}" ]; then

+      elog "${resizer} does not exist or is not executable."

+      return 1

+    fi

     eval "${resizer}" "${YUV_RAW_INPUT}" \

         "${YUV_RAW_INPUT_WIDTH}x${YUV_RAW_INPUT_HEIGHT}" \

--- a/test/simple_decoder.sh

+++ b/test/simple_decoder.sh

@@ -32,7 +32,10 @@

   local codec="$2"

   local output_file="${VPX_TEST_OUTPUT_DIR}/simple_decoder_${codec}.raw"

-  [ -x "${decoder}" ] || return 1

+  if [ ! -x "${decoder}" ]; then

+    elog "${decoder} does not exist or is not executable."

+    return 1

+  fi

   eval "${decoder}" "${input_file}" "${output_file}" ${devnull}

--- a/test/simple_encoder.sh

+++ b/test/simple_encoder.sh

@@ -29,7 +29,10 @@

   local codec="$1"

   local output_file="${VPX_TEST_OUTPUT_DIR}/simple_encoder_${codec}.ivf"

-  [ -x "${encoder}" ] || return 1

+  if [ ! -x "${encoder}" ]; then

+    elog "${encoder} does not exist or is not executable."

+    return 1

+  fi

   eval "${encoder}" "${codec}" "${YUV_RAW_INPUT_WIDTH}" \

       "${YUV_RAW_INPUT_HEIGHT}" "${YUV_RAW_INPUT}" "${output_file}" 9999 \

--- a/test/tools_common.sh

+++ b/test/tools_common.sh

@@ -17,6 +17,10 @@

 set -e

 devnull='> /dev/null 2>&1'

+elog() {

+  echo "$@" 1>&2

+}

+

 vlog() {

   if [ "${VPX_TEST_VERBOSE_OUTPUT}" = "yes" ]; then

     echo "$@"

--- a/test/twopass_encoder.sh

+++ b/test/twopass_encoder.sh

@@ -29,7 +29,10 @@

   local codec="$1"

   local output_file="${VPX_TEST_OUTPUT_DIR}/twopass_encoder_${codec}.ivf"

-  [ -x "${encoder}" ] || return 1

+  if [ ! -x "${encoder}" ]; then

+    elog "${encoder} does not exist or is not executable."

+    return 1

+  fi

   eval "${encoder}" "${codec}" "${YUV_RAW_INPUT_WIDTH}" \

       "${YUV_RAW_INPUT_HEIGHT}" "${YUV_RAW_INPUT}" "${output_file}" \

--- a/test/vp8cx_set_ref.sh

+++ b/test/vp8cx_set_ref.sh

@@ -34,7 +34,10 @@

   local output_file="${VPX_TEST_OUTPUT_DIR}/vp8cx_set_ref_${codec}.ivf"

   local ref_frame_num=90

-  [ -x "${encoder}" ] || return 1

+  if [ ! -x "${encoder}" ]; then

+    elog "${encoder} does not exist or is not executable."

+    return 1

+  fi

   eval "${encoder}" "${YUV_RAW_INPUT_WIDTH}" "${YUV_RAW_INPUT_HEIGHT}" \

       "${YUV_RAW_INPUT}" "${output_file}" "${ref_frame_num}" \

--- a/test/vp9_spatial_svc_encoder.sh

+++ b/test/vp9_spatial_svc_encoder.sh

@@ -34,7 +34,10 @@

   shift

-  [ -x "${encoder}" ] || return 1

+  if [ ! -x "${encoder}" ]; then

+    elog "${encoder} does not exist or is not executable."

+    return 1

+  fi

   eval "${encoder}" -w "${YUV_RAW_INPUT_WIDTH}" -h "${YUV_RAW_INPUT_HEIGHT}" \

       -k "${max_kf}" -f "${frames_to_encode}" "$@" "${YUV_RAW_INPUT}" \

--- a/test/vpx_temporal_svc_encoder.sh

+++ b/test/vpx_temporal_svc_encoder.sh

@@ -39,7 +39,10 @@

   shift 2

-  [ -x "${encoder}" ] || return 1

+  if [ ! -x "${encoder}" ]; then

+    elog "${encoder} does not exist or is not executable."

+    return 1

+  fi

   eval "${encoder}" "${YUV_RAW_INPUT}" "${output_file}" "${codec}" \

       "${YUV_RAW_INPUT_WIDTH}" "${YUV_RAW_INPUT_HEIGHT}" \