* lib/lto.exp (lto_option_list): Rename from option_list.

	* lib/compat.exp (compat_option_list): Rename from option_list.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@154477 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b52c014..b88b856 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-23  Janis Johnson  <janis187@us.ibm.com>
+
+       * lib/lto.exp (lto_option_list): Rename from option_list.
+       * lib/compat.exp (compat_option_list): Rename from option_list.
+

 2009-11-23  Andy Hutchinson  <hutchinsonandy@gcc.gnu.org>
 
        * gcc-dg/raw-string-1.c: Require-effective-target wchar.
 2009-11-23  Andy Hutchinson  <hutchinsonandy@gcc.gnu.org>
 
        * gcc-dg/raw-string-1.c: Require-effective-target wchar.

diff --git a/gcc/testsuite/lib/compat.exp b/gcc/testsuite/lib/compat.exp
index a4ec360..84053f3 100644 (file)
--- a/gcc/testsuite/lib/compat.exp
+++ b/gcc/testsuite/lib/compat.exp
@@ -48,7 +48,7 @@ if ![info exists COMPAT_OPTIONS] {
        [list {} {}]]
 }
 
        [list {} {}]]
 }
 

-set option_list $COMPAT_OPTIONS
+set compat_option_list $COMPAT_OPTIONS

 
 # Subsets of tests can be selectively disabled by members of this list:
 #  - ATTRIBUTE: disable all tests using the __attribute__ extension,
 
 # Subsets of tests can be selectively disabled by members of this list:
 #  - ATTRIBUTE: disable all tests using the __attribute__ extension,


@@ -245,7 +245,7 @@ proc compat-get-options { src } {
 #
 proc compat-execute { src1 sid use_alt } {
     global srcdir tmpdir
 #
 proc compat-execute { src1 sid use_alt } {
     global srcdir tmpdir

-    global option_list
+    global compat_option_list

     global tool
     global verbose
     global testcase
     global tool
     global verbose
     global testcase


@@ -328,7 +328,7 @@ proc compat-execute { src1 sid use_alt } {
     # Loop through all of the option lists used for this test.
 
     set count 0
     # Loop through all of the option lists used for this test.
 
     set count 0

-    foreach option_pair $option_list {
+    foreach option_pair $compat_option_list {

 
        # Pick out each set of options.
        set tst_option [lindex $option_pair 0]
 
        # Pick out each set of options.
        set tst_option [lindex $option_pair 0]

diff --git a/gcc/testsuite/lib/lto.exp b/gcc/testsuite/lib/lto.exp
index 9e9084d..1dd9c34 100644 (file)
--- a/gcc/testsuite/lib/lto.exp
+++ b/gcc/testsuite/lib/lto.exp
@@ -311,7 +311,7 @@ proc lto-get-options { src } {
 # SID identifies a test suite in the names of temporary files.
 proc lto-execute { src1 sid } {
     global srcdir tmpdir
 # SID identifies a test suite in the names of temporary files.
 proc lto-execute { src1 sid } {
     global srcdir tmpdir

-    global option_list
+    global lto_option_list

     global tool
     global verbose
     global testcase
     global tool
     global verbose
     global testcase


@@ -334,12 +334,12 @@ proc lto-execute { src1 sid } {
     set compile_xfail(0) "" 
 
     # If the main file defines dg-options, those flags are used to
     set compile_xfail(0) "" 
 
     # If the main file defines dg-options, those flags are used to

-    # overwrite the default option_list taken from LTO_OPTIONS.
+    # overwrite the default lto_option_list taken from LTO_OPTIONS.

     if { [string length $extra_flags(0)] > 0 } {
     if { [string length $extra_flags(0)] > 0 } {

-       set option_list $extra_flags(0)
+       set lto_option_list $extra_flags(0)

        set extra_flags(0) ""
     } else {
        set extra_flags(0) ""
     } else {

-       set option_list $LTO_OPTIONS
+       set lto_option_list $LTO_OPTIONS

     }
 
     # Check whether this test is supported for this target.
     }
 
     # Check whether this test is supported for this target.


@@ -417,7 +417,7 @@ proc lto-execute { src1 sid } {
 
     # Loop through all of the option lists used for this test.
     set count 0
 
     # Loop through all of the option lists used for this test.
     set count 0

-    foreach option $option_list {
+    foreach option $lto_option_list {

        verbose "Testing $testcase, $option"
 
        # There's a unique name for each executable we generate.
        verbose "Testing $testcase, $option"
 
        # There's a unique name for each executable we generate.