Re: PATCH: Add a testcase for PR binutils/14481

[Thomas Schwinge <thomas at codesourcery dot com>]

Hi!

On Thu, 16 Aug 2012 13:32:55 -0700, "H.J. Lu" <hongjiu.lu@intel.com> wrote:
> I checkec in this patch to add a testcase for PR binutils/14481.

> --- a/binutils/ChangeLog
> +++ b/binutils/ChangeLog
> @@ -1,3 +1,14 @@
> +2012-08-16  H.J. Lu  <hongjiu.lu@intel.com>
> +
> +	PR binutils/14481
> +	* Makefile.am (BFDTEST1_PROG): New.
> +	(TEST_PROGS): Likewise.
> +	(bfdtest1_DEPENDENCIES): Likewise.
> +	(noinst_PROGRAMS): Add $(TEST_PROGS).
> +	* Makefile.in: Regenerated.
> +
> +	* bfdtest1.c: New file.
> +

> --- a/binutils/testsuite/ChangeLog
> +++ b/binutils/testsuite/ChangeLog
> @@ -1,3 +1,11 @@
> +2012-08-16  H.J. Lu  <hongjiu.lu@intel.com>
> +
> +	PR binutils/14481
> +	* ar.exp (bfdtest1): New.
> +	(long_filenames): Run bfdtest1.
> +	(thin_archive): Likewise.
> +	(thin_archive_with_nested): Likewise.

> diff --git a/binutils/testsuite/binutils-all/ar.exp b/binutils/testsuite/binutils-all/ar.exp
> index 0caa847..c66c43e 100644
> --- a/binutils/testsuite/binutils-all/ar.exp
> +++ b/binutils/testsuite/binutils-all/ar.exp
> @@ -27,6 +27,8 @@ if ![is_remote host] {
>      }
>  }
>  
> +set bfdtest1 [findfile $base_dir/bfdtest1]

This is not correct for cross-testing on a Windows host, and results in a
bunch of ERRORs about the file not being found.  Here is a patch -- OK to
commit?

Index: binutils/testsuite/binutils-all/ar.exp
===================================================================
--- binutils/testsuite/binutils-all/ar.exp	(revision 390600)
+++ binutils/testsuite/binutils-all/ar.exp	(working copy)
@@ -27,7 +27,7 @@
     }
 }
 
-set bfdtest1 [findfile $base_dir/bfdtest1]
+set bfdtest1 [findfile $base_dir/bfdtest1[exe_ext_host]]
 
 # send_user "Version [binutil_version $AR]"
 
Index: binutils/testsuite/lib/utils-lib.exp
===================================================================
--- binutils/testsuite/lib/utils-lib.exp	(revision 390600)
+++ binutils/testsuite/lib/utils-lib.exp	(working copy)
@@ -125,8 +125,8 @@
 }
 
 #
-# exe_ext
-#	Returns target executable extension, if any.
+# exe_ext, exe_ext_host
+#	Returns target/host executable extension, if any.
 #
 proc exe_ext {} {
     if { [istarget *-*-mingw*] || [istarget *-*-cygwin*] } {
@@ -136,6 +136,14 @@
     }
 }
 
+proc exe_ext_host {} {
+    if { [ishost *-*-mingw*] || [ishost *-*-cygwin*] } {
+        return ".exe"
+    } else {
+        return ""
+    }
+}
+
 # Copied and modified from gas.
 
 # run_dump_test FILE (optional:) EXTRA_OPTIONS


Then, with that patch applied, the tests still FAIL on Windows hosts:

    FAIL: ar long file names (bfdtest1)
    FAIL: ar thin archive (bfdtest1)
    FAIL: ar thin archive with nested archive (bfdtest1)

The first two will go away (PASS) if I force (by copying it over) the
unstripped executable binutils/.libs/bfdtest1.exe to be used instead of
the stripped one -- huh.  Yet, the last of the three still FAILs.
Debugging that is for another day.


GrÃÃe,
 Thomas

Attachment: pgp00000.pgp
Description: PGP signature