X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=binutils%2Ftestsuite%2Fbinutils-all%2Far.exp;h=ab1afdcb92808faa67ddc97a12d48b5fb8a6bf21;hb=a45fc99392bdce4c67b43b1a0a05c77e7112afab;hp=f418e94ecbd080e061cb791e7b5ae281fe8fac7a;hpb=2ee563b53258d390d7446e90a67f465d504ae44c;p=binutils-gdb.git

diff --git a/binutils/testsuite/binutils-all/ar.exp b/binutils/testsuite/binutils-all/ar.exp
index f418e94ecbd..ab1afdcb928 100644
--- a/binutils/testsuite/binutils-all/ar.exp
+++ b/binutils/testsuite/binutils-all/ar.exp
@@ -1,8 +1,9 @@
-#   Copyright 1995, 1997 Free Software Foundation, Inc.
+#   Copyright 1995, 1997, 2002, 2004, 2007, 2008, 2009, 2010
+#   Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # This program is distributed in the hope that it will be useful,
@@ -12,7 +13,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 
 # Please email any bugs, comments, and/or additions to this file to:
 # bug-dejagnu@prep.ai.mit.edu
@@ -42,6 +43,7 @@ proc long_filenames { } {
     set file2 tmpdir/$n2
 
     remote_file build delete $file1
+    remote_file host delete $n1
 
     # Some file systems truncate file names at 14 characters, which
     # makes it impossible to run this test.  Check for that now.
@@ -54,8 +56,8 @@ proc long_filenames { } {
     puts $f "first"
     close $f
 
-
     remote_file build delete $file2
+    remote_file host delete $n2
 
     set status [catch "set f [open tmpdir/$n2 w]" errs]
     if { $status != 0 } {
@@ -67,14 +69,14 @@ proc long_filenames { } {
     close $f
 
     if [is_remote host] {
-	set file1 [remote_download host $file1];
-	set file2 [remote_download host $file2];
+	set file1 [remote_download host $file1]
+	set file2 [remote_download host $file2]
 	set dest artest.a
     } else {
 	set dest tmpdir/artest.a
     }
 
-    remote_file host delete $dest;
+    remote_file host delete $dest
 
     set got [binutils_run $AR "rc $dest $file1 $file2"]
     if [is_remote host] {
@@ -90,7 +92,7 @@ proc long_filenames { } {
 	return
     }
 
-    remote_file host delete $dest;
+    remote_file host delete $dest
     set got [binutils_run $AR "rc $dest $file1 $file2"]
 
     if ![string match "" $got] {
@@ -102,15 +104,15 @@ proc long_filenames { } {
     remote_file build delete tmpdir/$n2
 
     set got [binutils_run $AR "t $dest"]
-    regsub "\[\r\n \t\]*$" "$got" "" got;
+    regsub "\[\r\n \t\]*$" "$got" "" got
     if ![string match "$n1*$n2" $got] {
 	fail $testname
 	return
     }
     
     if [is_remote host] {
-	remote_file host delete $file1;
-	remote_file host delete $file2;
+	remote_file host delete $file1
+	remote_file host delete $file2
     }
 
     verbose -log "$AR x $dest"
@@ -123,8 +125,8 @@ proc long_filenames { } {
     }
 
     if [is_remote host] {
-	remote_upload host $n1 tmpdir/$n1;
-	remote_upload host $n2 tmpdir/$n2;
+	remote_upload host $n1 tmpdir/$n1
+	remote_upload host $n2 tmpdir/$n2
 	set file1 tmpdir/$n1
 	set file2 tmpdir/$n2
     } else {
@@ -214,7 +216,236 @@ proc symbol_table { } {
     pass $testname
 }
 
+# Test building a thin archive.
+
+proc thin_archive { } {
+    global AR
+    global AS
+    global NM
+    global srcdir
+    global subdir
+
+    set testname "ar thin archive"
+
+    if ![binutils_assemble $srcdir/$subdir/bintest.s tmpdir/bintest.o] {
+	unresolved $testname
+	return
+    }
+
+    if [is_remote host] {
+	set archive artest.a
+	set objfile [remote_download host tmpdir/bintest.o]
+	remote_file host delete $archive
+    } else {
+	set archive tmpdir/artest.a
+	set objfile tmpdir/bintest.o
+    }
+
+    remote_file build delete tmpdir/artest.a
+
+    set got [binutils_run $AR "rcT $archive ${objfile}"]
+    if ![string match "" $got] {
+	fail $testname
+	return
+    }
+
+    set got [binutils_run $NM "--print-armap $archive"]
+    if { ![string match "*text_symbol in *bintest.o*" $got] \
+	 || ![string match "*data_symbol in *bintest.o*" $got] \
+	 || ![string match "*common_symbol in *bintest.o*" $got] \
+	 || [string match "*static_text_symbol in *bintest.o*" $got] \
+	 || [string match "*static_data_symbol in *bintest.o*" $got] \
+	 || [string match "*external_symbol in *bintest.o*" $got] } {
+	fail $testname
+	return
+    }
+
+    pass $testname
+}
+
+# Test building a thin archive with a nested archive.
+
+proc thin_archive_with_nested { } {
+    global AR
+    global AS
+    global NM
+    global srcdir
+    global subdir
+
+    set testname "ar thin archive with nested archive"
+
+    if ![binutils_assemble $srcdir/$subdir/bintest.s tmpdir/bintest.o] {
+	unresolved $testname
+	return
+    }
+
+    if [is_remote host] {
+	set archive artest.a
+	set archive2 artest2.a
+	set objfile [remote_download host tmpdir/bintest.o]
+	remote_file host delete $archive
+    } else {
+	set archive tmpdir/artest.a
+	set archive2 tmpdir/artest2.a
+	set objfile tmpdir/bintest.o
+    }
+
+    remote_file build delete tmpdir/artest.a
+
+    set got [binutils_run $AR "rc $archive ${objfile}"]
+    if ![string match "" $got] {
+	fail $testname
+	return
+    }
+
+    remote_file build delete tmpdir/artest2.a
+
+    set got [binutils_run $AR "rcT $archive2 ${archive}"]
+    if ![string match "" $got] {
+	fail $testname
+	return
+    }
+
+    set got [binutils_run $NM "--print-armap $archive"]
+    if { ![string match "*text_symbol in *bintest.o*" $got] \
+	 || ![string match "*data_symbol in *bintest.o*" $got] \
+	 || ![string match "*common_symbol in *bintest.o*" $got] \
+	 || [string match "*static_text_symbol in *bintest.o*" $got] \
+	 || [string match "*static_data_symbol in *bintest.o*" $got] \
+	 || [string match "*external_symbol in *bintest.o*" $got] } {
+	fail $testname
+	return
+    }
+
+    pass $testname
+}
+
+# Test POSIX-compatible argument parsing.
+
+proc argument_parsing { } {
+    global AR
+    global AS
+    global srcdir
+    global subdir
+
+    set testname "ar argument parsing"
+
+    if ![binutils_assemble $srcdir/$subdir/bintest.s tmpdir/bintest.o] {
+	unresolved $testname
+	return
+    }
+
+    if [is_remote host] {
+	set archive artest.a
+	set objfile [remote_download host tmpdir/bintest.o]
+	remote_file host delete $archive
+    } else {
+	set archive tmpdir/artest.a
+	set objfile tmpdir/bintest.o
+    }
+
+    remote_file build delete tmpdir/artest.a
+
+    set got [binutils_run $AR "-r -c $archive ${objfile}"]
+    if ![string match "" $got] {
+	fail $testname
+	return
+    }
+
+    pass $testname
+}
+
+# Test building a deterministic archive.
+
+proc deterministic_archive { } {
+    global AR
+    global AS
+    global NM
+    global srcdir
+    global subdir
+
+    set testname "ar deterministic archive"
+
+    if ![binutils_assemble $srcdir/$subdir/bintest.s tmpdir/bintest.o] {
+	unresolved $testname
+	return
+    }
+
+    if [is_remote host] {
+	set archive artest.a
+	set objfile [remote_download host tmpdir/bintest.o]
+	remote_file host delete $archive
+    } else {
+	set archive tmpdir/artest.a
+	set objfile tmpdir/bintest.o
+    }
+
+    remote_file build delete tmpdir/artest.a
+
+    set got [binutils_run $AR "rcD $archive ${objfile}"]
+    if ![string match "" $got] {
+	fail $testname
+	return
+    }
+
+    set got [binutils_run $AR "tv $archive"]
+    # This only checks the file mode and uid/gid.  We can't easily match
+    # date because it's printed with the user's timezone.
+    if ![string match "rw-r--r-- 0/0 *bintest.o*" $got] {
+	fail $testname
+	return
+    }
+
+    pass $testname
+}
+
+proc unique_symbol { } {
+    global AR
+    global AS
+    global NM
+    global srcdir
+    global subdir
+
+    set testname "ar unique symbol in archive"
+
+    if ![binutils_assemble $srcdir/$subdir/unique.s tmpdir/unique.o] {
+	unresolved $testname
+    }
+
+    if [is_remote host] {
+	set archive artest.a
+	set objfile [remote_download host tmpdir/unique.o]
+	remote_file host delete $archive
+    } else {
+	set archive tmpdir/artest.a
+	set objfile tmpdir/unique.o
+    }
+
+    remote_file build delete tmpdir/artest.a
+
+    set got [binutils_run $AR "-s -r -c $archive ${objfile}"]
+    if ![string match "" $got] {
+	fail $testname
+	return
+    }
+
+    set got [binutils_run $NM "--print-armap $archive"]
+    if ![string match "*foo in *unique.o*" $got] {
+	fail $testname
+	return
+    }
+
+    pass $testname
+}
+
 # Run the tests.
 
 long_filenames
 symbol_table
+thin_archive
+thin_archive_with_nested
+argument_parsing
+deterministic_archive
+if [is_elf_format] {
+    unique_symbol
+}