diff options
| -rw-r--r-- | binutils/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | binutils/testsuite/binutils-all/ar.exp | 16 |
2 files changed, 17 insertions, 4 deletions
diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog index 1231a24..9e98d0c 100644 --- a/binutils/testsuite/ChangeLog +++ b/binutils/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-06-03 Nick Clifton <nickc@redhat.com> + + * binutils-all/ar.exp: Skip tests involving bfdtest1 and bfdtest2 + if these executables are not present. + 2014-04-30 Nick Clifton <nickc@redhat.com> * binutils-all/debug_str.s: New test. diff --git a/binutils/testsuite/binutils-all/ar.exp b/binutils/testsuite/binutils-all/ar.exp index cbfb39e..21b7a69 100644 --- a/binutils/testsuite/binutils-all/ar.exp +++ b/binutils/testsuite/binutils-all/ar.exp @@ -557,16 +557,24 @@ proc move_an_element { } { # Run the tests. -set bfdtests [list bfdtest1 bfdtest2] +# Only run the bfdtest checks if the programs exist. Since these +# programs are built but not installed, running the testsuite on an +# installed toolchain will produce ERRORs about missing bfdtest1 and +# bfdtest2 executables. +if { [file exists $base_dir/bfdtest1] && [file exists $base_dir/bfdtest2] } { + set bfdtests [list bfdtest1 bfdtest2] + + long_filenames $bfdtests + thin_archive $bfdtests + thin_archive_with_nested $bfdtests +} -long_filenames $bfdtests symbol_table -thin_archive $bfdtests -thin_archive_with_nested $bfdtests argument_parsing deterministic_archive delete_an_element move_an_element + if { [is_elf_format] && ![istarget "*-*-hpux*"] && ![istarget "msp*-*-*"] } { |