binaries: Remove 'runtest' from the list.

We do not ship it anymore, so don't expect it.
We don't complain if present, because we could be checking an old
toolchain.

Change-Id: Ie6622c3e47e3f70c907b8fda9e2dbea6e407ea0e

9 files changed, 9 insertions, 14 deletions

diff --git a/binaries/build.sh b/binaries/build.sh
index 9a4eb21..71acb01 100755
--- a/binaries/build.sh
+++ b/binaries/build.sh
@@ -35,6 +35,10 @@ fi
 
 echo "$(basename $(pwd)): FAIL" > result.txt
 
+# Build the list of files present under $TOOLCHAIN/bin and compare it
+# with the expected list.  The expected list is processed by expanding
+# the right $TARGET.
+
 # make reference list
 cp "$LIST" ref-list.txt
 case ${TARGET} in
@@ -48,14 +52,13 @@ sed -e "s/^__TARGET__/${TARGET}/;" -i ref-list.txt
 
 # get list from toolchain
 (cd $TOOLCHAIN/bin && ls ) > toolchain-list.txt
-sed -e "/^${TARGET}-gcc-[0-9]\\.[0-9]\\.[0-9]${MINGW:+.exe}$/ d" -i toolchain-list.txt
-set -x
-
-# Build the list of files present under $TOOLCHAIN/bin and compare it
-# with the expected list.  The expected list is processed by expanding
-# the right $TARGET and appending $EXT as needed.
 # Remove $TARGET-gcc-X.Y.Z${EXT} from the list of files actually
 # present to make comparison easier.
+sed -e "/^${TARGET}-gcc-[0-9]\\.[0-9]\\.[0-9]${MINGW:+.exe}$/ d" -i toolchain-list.txt
+# We do not ship 'runtest' anymore. Don't complain if present in case
+# we are checking an old toolchain
+sed -e "/^runtest$/ d" -i toolchain-list.txt
+set -x
 
 diff -u ref-list.txt toolchain-list.txt
 set +x
diff --git a/binaries/list-4.txt b/binaries/list-4.txt
index e357a2a..b7eecab 100644
--- a/binaries/list-4.txt
+++ b/binaries/list-4.txt
@@ -25,4 +25,3 @@ __TARGET__-size
 __TARGET__-strings
 __TARGET__-strip
 gdbserver
-runtest
diff --git a/binaries/list-5.txt b/binaries/list-5.txt
index a970380..a43770b 100644
--- a/binaries/list-5.txt
+++ b/binaries/list-5.txt
@@ -27,4 +27,3 @@ __TARGET__-size
 __TARGET__-strings
 __TARGET__-strip
 gdbserver
-runtest
diff --git a/binaries/list-6.txt b/binaries/list-6.txt
index 1a28076..ef2b28c 100644
--- a/binaries/list-6.txt
+++ b/binaries/list-6.txt
@@ -29,4 +29,3 @@ __TARGET__-size
 __TARGET__-strings
 __TARGET__-strip
 gdbserver
-runtest
diff --git a/binaries/list-mingw-4.txt b/binaries/list-mingw-4.txt
index cf98e10..c75e0e0 100644
--- a/binaries/list-mingw-4.txt
+++ b/binaries/list-mingw-4.txt
@@ -29,4 +29,3 @@ gdbserver
 libpython2.7.dll
 libwinpthread-1.dll
 pylib
-runtest
diff --git a/binaries/list-mingw-5.txt b/binaries/list-mingw-5.txt
index 6bce9ca..cb008b3 100644
--- a/binaries/list-mingw-5.txt
+++ b/binaries/list-mingw-5.txt
@@ -31,4 +31,3 @@ gdbserver
 libpython2.7.dll
 libwinpthread-1.dll
 pylib
-runtest
diff --git a/binaries/list-mingw-6.txt b/binaries/list-mingw-6.txt
index 05a3e47..5a904b5 100644
--- a/binaries/list-mingw-6.txt
+++ b/binaries/list-mingw-6.txt
@@ -33,4 +33,3 @@ gdbserver
 libpython2.7.dll
 libwinpthread-1.dll
 pylib
-runtest
diff --git a/binaries/list-mingw.txt b/binaries/list-mingw.txt
index 05a3e47..5a904b5 100644
--- a/binaries/list-mingw.txt
+++ b/binaries/list-mingw.txt
@@ -33,4 +33,3 @@ gdbserver
 libpython2.7.dll
 libwinpthread-1.dll
 pylib
-runtest
diff --git a/binaries/list.txt b/binaries/list.txt
index 1a28076..ef2b28c 100644
--- a/binaries/list.txt
+++ b/binaries/list.txt
@@ -29,4 +29,3 @@ __TARGET__-size
 __TARGET__-strings
 __TARGET__-strip
 gdbserver
-runtest