From dc89df6af02e57a0087729705ceebfdd36e86654 Mon Sep 17 00:00:00 2001
From: Richard Sandiford <rdsandiford@googlemail.com>
Date: Mon, 23 Jul 2007 14:03:33 +0000
Subject: [PATCH] gas/testsuite/ 	* lib/gas-defs.exp (run_list_test):
 Make the options optional. 	* gas/cr16/cr16.exp (run_list_test): Delete.

---
 gas/testsuite/ChangeLog         |  5 +++++
 gas/testsuite/gas/cr16/cr16.exp | 13 -------------
 gas/testsuite/lib/gas-defs.exp  |  4 ++--
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 396f982a75e..993439511ed 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-23  Richard Sandiford  <richard@codesourcery.com>
+
+	* lib/gas-defs.exp (run_list_test): Make the options optional.
+	* gas/cr16/cr16.exp (run_list_test): Delete.
+
 2007-07-19  Nick Clifton  <nickc@redhat.com>
 
 	PR gas/4804
diff --git a/gas/testsuite/gas/cr16/cr16.exp b/gas/testsuite/gas/cr16/cr16.exp
index 6697c33d6ae..9285da81736 100644
--- a/gas/testsuite/gas/cr16/cr16.exp
+++ b/gas/testsuite/gas/cr16/cr16.exp
@@ -2,19 +2,6 @@
 # Driver for CR16 assembler testsuite
 #
 
-proc run_list_test { name opts } {
-  global srcdir subdir
-  set testname "cr16 $name"
-  set file $srcdir/$subdir/$name
-  gas_run ${name}.s $opts ">&dump.out"
-  if {[regexp_diff "dump.out" "${file}.l"] } {
-    fail $testname
-    verbose "output is [file_contents "dump.out"]" 2
-    return
-  }
-  pass $testname
-}
-
 if ![istarget cr16-*-*] {
     return
 }
diff --git a/gas/testsuite/lib/gas-defs.exp b/gas/testsuite/lib/gas-defs.exp
index c83cf221f62..8d4902a4d0a 100644
--- a/gas/testsuite/lib/gas-defs.exp
+++ b/gas/testsuite/lib/gas-defs.exp
@@ -890,14 +890,14 @@ if ![string length [info proc prune_warnings]] {
     }
 }
 
-# run_list_test NAME OPTS (optional): TESTNAME
+# run_list_test NAME (optional): OPTS TESTNAME
 #
 # Assemble the file "NAME.d" with command line options OPTS and
 # compare the assembler standard error output against thee regular
 # expressions given in the file "NAME.l".  If TESTNAME is provided,
 # it will be used as the name of the test.
 
-proc run_list_test { name opts {testname {}} } {
+proc run_list_test { name {opts {}} {testname {}} } {
     global srcdir subdir
     if { [string length $testname] == 0 } then {
 	set testname "[file tail $subdir] $name"
-- 
2.30.2