diff options
| author | Christophe Lyon <christophe.lyon@linaro.org> | 2018-12-07 10:15:01 +0000 |
|---|---|---|
| committer | Christophe Lyon <christophe.lyon@linaro.org> | 2018-12-10 15:29:03 +0000 |
| commit | 51be7c3e868dbc9cd8d15a58504fa1128c983cee (patch) | |
| tree | ff7e94d21fb1b41ffccf90fc60edcd7efdeaa67a | |
| parent | 7d69fafd2ae16cef1c470a81ff12ccc6d065833b (diff) | |
binaries: Handle new gdb-add-index binary.
Since we updated ABE's default gdb.conf to point to gdb-8.2, a new
binary is build: gdb-add-index. This makes this test fail.
This patch fixes it by adding the new name in the expected list.
Do not bother with handling legacy binary toolchains lacking this file
(some validation jobs run this test against the 'latest' release,
which will soon have this file anyway).
Once our next binary releases are out, it would be difficult to handle
this case nicely, unless we hardcode release versions in the tests
(because we'll have offcial binary releases with and without this new
binary, not only "regtest" ones).
Change-Id: I35f1b0d01c46f71aa4e13693040a87d56db7fe72
| -rwxr-xr-x | binaries/build.sh | 6 | ||||
| -rw-r--r-- | binaries/list-mingw.txt | 1 | ||||
| -rw-r--r-- | binaries/list.txt | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/binaries/build.sh b/binaries/build.sh index 438dadb..93133e7 100755 --- a/binaries/build.sh +++ b/binaries/build.sh @@ -49,20 +49,24 @@ case ${TARGET} in sed -e "/^\(__TARGET__-gfortran${MINGW:+.exe}\|gdbserver\)$/ d" -i ref-list.txt ;; esac + sed -e "s/^__TARGET__/${TARGET}/;" -i ref-list.txt # get list from toolchain (cd $TOOLCHAIN/bin && ls ) > toolchain-list.txt + # gdbserver is in the sysroot part (cd $TOOLCHAIN/${TARGET}/libc/usr/bin && ls ) | grep gdbserver >> toolchain-list.txt || true + # 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 +set -x diff -u ref-list.txt toolchain-list.txt set +x diff --git a/binaries/list-mingw.txt b/binaries/list-mingw.txt index af46d4f..9670a2b 100644 --- a/binaries/list-mingw.txt +++ b/binaries/list-mingw.txt @@ -15,6 +15,7 @@ __TARGET__-gcov-dump.exe __TARGET__-gcov-tool.exe __TARGET__-gcov.exe __TARGET__-gdb.exe +__TARGET__-gdb-add-index.exe __TARGET__-gfortran.exe __TARGET__-gprof.exe __TARGET__-ld.bfd.exe diff --git a/binaries/list.txt b/binaries/list.txt index ef2b28c..d5e63a7 100644 --- a/binaries/list.txt +++ b/binaries/list.txt @@ -15,6 +15,7 @@ __TARGET__-gcov __TARGET__-gcov-dump __TARGET__-gcov-tool __TARGET__-gdb +__TARGET__-gdb-add-index __TARGET__-gfortran __TARGET__-gprof __TARGET__-ld |