From a3ce59de58fe90c2dca074acc35ace5138754f13 Mon Sep 17 00:00:00 2001
From: Reuben Morais <reuben.morais@gmail.com>
Date: Thu, 6 Feb 2020 18:06:10 +0100
Subject: [PATCH 1/3] Remove extraneous OR operators in tc-tests-utils.sh

Fixes:

+ '[' -o 16k = 8k ']'
/home/build-user/DeepSpeech/ds/taskcluster/tc-tests-utils.sh: line 262: [: too many arguments
---
 taskcluster/tc-tests-utils.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/taskcluster/tc-tests-utils.sh b/taskcluster/tc-tests-utils.sh
index 120c1440..09cc1209 100755
--- a/taskcluster/tc-tests-utils.sh
+++ b/taskcluster/tc-tests-utils.sh
@@ -259,7 +259,7 @@ assert_correct_ldc93s1_prodmodel()
     assert_correct_inference "$1" "she had reduce and greasy wash water all year" "$2"
   fi;
 
-  if [ -o "$3" = "8k" ]; then
+  if [ "$3" = "8k" ]; then
     assert_correct_inference "$1" "she had conduct suit in greasy wash water all year" "$2"
   fi;
 }
@@ -270,7 +270,7 @@ assert_correct_ldc93s1_prodtflitemodel()
     assert_correct_inference "$1" "she had i do utterly was or all year" "$2"
   fi;
 
-  if [ -o "$3" = "8k" ]; then
+  if [ "$3" = "8k" ]; then
     assert_correct_inference "$1" "she had conduct suit in greasy wash water all year" "$2"
   fi;
 }
@@ -281,7 +281,7 @@ assert_correct_ldc93s1_prodmodel_stereo_44k()
     assert_correct_inference "$1" "she had reduce and greasy wash water all year" "$2"
   fi;
 
-  if [ -o "$3" = "8k" ]; then
+  if [ "$3" = "8k" ]; then
     assert_correct_inference "$1" "she had conduct suit in greasy wash water all year" "$2"
   fi;
 }
@@ -292,7 +292,7 @@ assert_correct_ldc93s1_prodtflitemodel_stereo_44k()
     assert_correct_inference "$1" "she headed grey was or all year" "$2"
   fi;
 
-  if [ -o "$3" = "8k" ]; then
+  if [ "$3" = "8k" ]; then
     assert_correct_inference "$1" "she had conduct suit in greasy wash water all year" "$2"
   fi;
 }

From 245fb24946889e0fa3a85400994031c2271cddbe Mon Sep 17 00:00:00 2001
From: Reuben Morais <reuben.morais@gmail.com>
Date: Thu, 6 Feb 2020 22:23:20 +0100
Subject: [PATCH 2/3] Fix expected outputs

---
 taskcluster/tc-tests-utils.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/taskcluster/tc-tests-utils.sh b/taskcluster/tc-tests-utils.sh
index 09cc1209..fcd23ae8 100755
--- a/taskcluster/tc-tests-utils.sh
+++ b/taskcluster/tc-tests-utils.sh
@@ -271,7 +271,7 @@ assert_correct_ldc93s1_prodtflitemodel()
   fi;
 
   if [ "$3" = "8k" ]; then
-    assert_correct_inference "$1" "she had conduct suit in greasy wash water all year" "$2"
+    assert_correct_inference "$1" "she had up a out and we wash or a" "$2"
   fi;
 }
 
@@ -282,7 +282,7 @@ assert_correct_ldc93s1_prodmodel_stereo_44k()
   fi;
 
   if [ "$3" = "8k" ]; then
-    assert_correct_inference "$1" "she had conduct suit in greasy wash water all year" "$2"
+    assert_correct_inference "$1" "she had reduce and greasy wash water all year" "$2"
   fi;
 }
 
@@ -293,7 +293,7 @@ assert_correct_ldc93s1_prodtflitemodel_stereo_44k()
   fi;
 
   if [ "$3" = "8k" ]; then
-    assert_correct_inference "$1" "she had conduct suit in greasy wash water all year" "$2"
+    assert_correct_inference "$1" "she headed grey was or all year" "$2"
   fi;
 }
 

From 92be76657fe99d4078447a6130dbb6565dd544be Mon Sep 17 00:00:00 2001
From: Reuben Morais <reuben.morais@gmail.com>
Date: Mon, 10 Feb 2020 13:00:33 +0100
Subject: [PATCH 3/3] Stop using 8kHz data with concurrent streams test as it
 does not resample

---
 taskcluster/tc-tests-utils.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/taskcluster/tc-tests-utils.sh b/taskcluster/tc-tests-utils.sh
index fcd23ae8..866d20c0 100755
--- a/taskcluster/tc-tests-utils.sh
+++ b/taskcluster/tc-tests-utils.sh
@@ -468,7 +468,7 @@ run_prod_concurrent_stream_tests()
              --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} \
              --lm ${TASKCLUSTER_TMP_DIR}/lm.binary \
              --trie ${TASKCLUSTER_TMP_DIR}/trie \
-             --audio1 ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} \
+             --audio1 ${TASKCLUSTER_TMP_DIR}/LDC93S1_pcms16le_1_16000.wav \
              --audio2 ${TASKCLUSTER_TMP_DIR}/new-home-in-the-stars-16k.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
   status=$?
   set -e
@@ -476,7 +476,7 @@ run_prod_concurrent_stream_tests()
   output1=$(echo "${output}" | head -n 1)
   output2=$(echo "${output}" | tail -n 1)
 
-  assert_correct_ldc93s1_prodmodel "${output1}" "${status}" "${_bitrate}"
+  assert_correct_ldc93s1_prodmodel "${output1}" "${status}" "16k"
   assert_correct_inference "${output2}" "we must find a new home in the stars" "${status}"
 }