From: Nick Clifton <nickc@redhat.com>
Date: Tue, 3 Jun 2014 07:37:29 +0000 (+0100)
Subject:  If the binutils testsuite is run on an installed toolchain the tests involving
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9bc24099c80dca9ab1d5f2d18670de666f3f4590;p=binutils-gdb.git

 If the binutils testsuite is run on an installed toolchain the tests involving
the bfdtest1 and bfdtest2 executables will fail because they are not installed.
 Since the programs only exist to be used by the testsuite it does not make sense
to install them, so instead I have chosen to create a patch which skips the tests
when they are not present.

	* binutils-all/ar.exp: Skip tests involving bfdtest1 and bfdtest2
	if these executables are not present.
---

diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index 1231a24b8cf..9e98d0c7bd7 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 cbfb39e4017..21b7a695952 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*-*-*"] } {