From 4287f8de9769cdab8470a35e3fadce3be05753b3 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Thu, 28 Oct 2010 09:10:08 +0000
Subject: [PATCH] ld/testsuite/

	* ld-scripts/script.exp: Sort all filename globs.

gas/testsuite/

	* gas/iq2000/load-hazards.exp: Sort all filename globs.
	* gas/iq2000/yield.exp: Likewise.
	* gas/mt/errors.exp: Likewise.
---
 gas/testsuite/ChangeLog                   | 6 ++++++
 gas/testsuite/gas/iq2000/load-hazards.exp | 2 +-
 gas/testsuite/gas/iq2000/yield.exp        | 2 +-
 gas/testsuite/gas/mt/errors.exp           | 2 +-
 ld/testsuite/ChangeLog                    | 4 ++++
 ld/testsuite/ld-scripts/script.exp        | 4 ++--
 6 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 4517d5249c..9e12d939f2 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-28  Thomas Schwinge  <thomas@schwinge.name>
+
+	* gas/iq2000/load-hazards.exp: Sort all filename globs.
+	* gas/iq2000/yield.exp: Likewise.
+	* gas/mt/errors.exp: Likewise.
+
 2010-10-28  Alan Modra  <amodra@gmail.com>
 
 	* gas/elf/elf.exp (groupautob): Don't run on xtensa.
diff --git a/gas/testsuite/gas/iq2000/load-hazards.exp b/gas/testsuite/gas/iq2000/load-hazards.exp
index 654c96accc..1e8657e24c 100644
--- a/gas/testsuite/gas/iq2000/load-hazards.exp
+++ b/gas/testsuite/gas/iq2000/load-hazards.exp
@@ -29,7 +29,7 @@ proc iq2000_warning_test { file testname {warnpattern ""} } {
 }
 
 if [istarget iq2000*-*-*] {
-    foreach file [glob -nocomplain -- $srcdir/$subdir/hazard*.s] {
+    foreach file [lsort [glob -nocomplain -- $srcdir/$subdir/hazard*.s]] {
 	set file [file tail $file]
 	switch -- $file {
 	    "hazard0.s" {
diff --git a/gas/testsuite/gas/iq2000/yield.exp b/gas/testsuite/gas/iq2000/yield.exp
index c68095f391..30fae38b81 100644
--- a/gas/testsuite/gas/iq2000/yield.exp
+++ b/gas/testsuite/gas/iq2000/yield.exp
@@ -28,7 +28,7 @@ proc iq2000_error_test { file testname {pattern ""} } {
 }
 
 if [istarget iq2000*-*-*] {
-    foreach file [glob -nocomplain -- $srcdir/$subdir/yield*.s] {
+    foreach file [lsort [glob -nocomplain -- $srcdir/$subdir/yield*.s]] {
 	set file [file tail $file]
 	iq2000_error_test $file \
 		"assembler emits yield instruction in delay slot error for $file" \
diff --git a/gas/testsuite/gas/mt/errors.exp b/gas/testsuite/gas/mt/errors.exp
index 30d217fc77..7b94bdbab5 100644
--- a/gas/testsuite/gas/mt/errors.exp
+++ b/gas/testsuite/gas/mt/errors.exp
@@ -28,7 +28,7 @@ proc mrisc1_error_test { file testname {warnpattern ""} } {
 }
 
 if [istarget mt-*-*] {
-    foreach file [glob -nocomplain -- $srcdir/$subdir/bad*.s] {
+    foreach file [lsort [glob -nocomplain -- $srcdir/$subdir/bad*.s]] {
 	set file [file tail $file]
 	switch -- $file {
 	    "badreg.s" {
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 2676bfb17a..c6771a66d4 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-28  Thomas Schwinge  <thomas@schwinge.name>
+
+	* ld-scripts/script.exp: Sort all filename globs.
+
 2010-10-28  Alan Modra  <amodra@gmail.com>
 
 	* ld-plugin/plugin.exp (libs): Remove $LIBS.
diff --git a/ld/testsuite/ld-scripts/script.exp b/ld/testsuite/ld-scripts/script.exp
index 66c62f50ed..2e699228ad 100644
--- a/ld/testsuite/ld-scripts/script.exp
+++ b/ld/testsuite/ld-scripts/script.exp
@@ -1,6 +1,6 @@
 # Test basic linker script functionality
 # By Ian Lance Taylor, Cygnus Support
-#   Copyright 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2009
+#   Copyright 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2009, 2010
 #   Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
@@ -127,7 +127,7 @@ if ![ld_simple_link $ld tmpdir/script "$flags -T $srcdir/$subdir/memory.t tmpdir
     check_script
 }
 
-set test_script_list [glob $srcdir/$subdir/region-alias-*.t]
+set test_script_list [lsort [glob $srcdir/$subdir/region-alias-*.t]]
 
 foreach test_script $test_script_list {
     if ![ld_simple_link $ld tmpdir/script "$flags -T $test_script tmpdir/script.o"] {