Modify C vs SIMD test script

- Enable C vs SIMD test for x86 32-bit platform
- Correct a print message in run_tests()

BUG=webm:1800

Change-Id: Ib1ccd3a87a64b5ec6cde524a14d5d1b7e200abfb

diff --git a/test/tools_common.sh b/test/tools_common.sh
index 0e4a0a5..d0dd24d 100755 (executable)
--- a/test/tools_common.sh
+++ b/test/tools_common.sh
@@ -280,7 +280,12 @@ run_tests() {
     test_end "${test}"
   done
 
-  local tested_config="$(test_configuration_target) @ $(current_hash)"
+  # C vs SIMD tests are run for x86 32-bit, 64-bit and ARM platform
+  if [ "${test_name}" = "vp9_c_vs_simd_encode" ]; then
+    local tested_config="$(current_hash)"
+  else
+    local tested_config="$(test_configuration_target) @ $(current_hash)"
+  fi
   echo "${test_name}: Done, all tests pass for ${tested_config}."
 }
 

diff --git a/test/vp9_c_vs_simd_encode.sh b/test/vp9_c_vs_simd_encode.sh
index 42e5f3b..7cd6054 100755 (executable)
--- a/test/vp9_c_vs_simd_encode.sh
+++ b/test/vp9_c_vs_simd_encode.sh
@@ -378,16 +378,14 @@ vp9_c_vs_simd_enc_test() {
   # Test Generic
   vp9_test_generic
 
-  # TODO(webm:1816): Enable x86 test once issue 1816 is fixed.
-  # Details: https://bugs.chromium.org/p/webm/issues/detail?id=1816
   # Test x86 (32 bit)
-  # echo "vp9 test for x86 (32 bit): Started."
-  # if ! vp9_test_x86 "x86"; then
-  #   echo "vp9 test for x86 (32 bit): Done, test failed."
-  #   return 1
-  # else
-  #   echo "vp9 test for x86 (32 bit): Done, all tests passed."
-  # fi
+  echo "vp9 test for x86 (32 bit): Started."
+  if ! vp9_test_x86 "x86"; then
+    echo "vp9 test for x86 (32 bit): Done, test failed."
+    return 1
+  else
+    echo "vp9 test for x86 (32 bit): Done, all tests passed."
+  fi
 
   # Test x86_64 (64 bit)
   if [ "$(eval uname -m)" = "x86_64" ]; then