Revert "[testsuite/guality] Run guality tests with Og"

This reverts commit 6b84828445f7875d1dddbd90a8d86b10c4e8e776.

From-SVN: r262667

5 files changed, 1 insertions, 37 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 54834e9..b197642 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,10 +1,3 @@
-2018-07-15  Tom de Vries  <tdevries@suse.de>
-
-	* lib/gcc-gdb-test.exp (guality_minimal_options): New proc.
-	* g++.dg/guality/guality.exp: Ensure Og is part of torture options.
-	* gcc.dg/guality/guality.exp: Same.
-	* gfortran.dg/guality/guality.exp: Same.
-
 2018-07-13  H.J. Lu  <hongjiu.lu@intel.com>
 	    Sunil K Pandey  <sunil.k.pandey@intel.com>
 
diff --git a/gcc/testsuite/g++.dg/guality/guality.exp b/gcc/testsuite/g++.dg/guality/guality.exp
index 757b20b..4be22ba 100644
--- a/gcc/testsuite/g++.dg/guality/guality.exp
+++ b/gcc/testsuite/g++.dg/guality/guality.exp
@@ -48,14 +48,6 @@ if ![info exists ::env(GUALITY_GDB_NAME)] {
 }
 report_gdb $::env(GUALITY_GDB_NAME) [info script]
 
-global DG_TORTURE_OPTIONS LTO_TORTURE_OPTIONS
-set guality_dg_torture_options [guality_minimal_options $DG_TORTURE_OPTIONS]
-torture-init
-set-torture-options \
-    $guality_dg_torture_options \
-    [list {}] \
-    $LTO_TORTURE_OPTIONS
-
 if {[check_guality "
   #include \"$srcdir/$subdir/guality.h\"
   volatile long int varl = 6;
@@ -73,5 +65,4 @@ if [info exists guality_gdb_name] {
     unsetenv GUALITY_GDB_NAME
 }
 
-torture-finish
 dg-finish
diff --git a/gcc/testsuite/gcc.dg/guality/guality.exp b/gcc/testsuite/gcc.dg/guality/guality.exp
index ca77a44..d999434 100644
--- a/gcc/testsuite/gcc.dg/guality/guality.exp
+++ b/gcc/testsuite/gcc.dg/guality/guality.exp
@@ -62,8 +62,7 @@ proc guality_transform_options { args } {
 }
 
 global DG_TORTURE_OPTIONS
-set guality_dg_torture_options [guality_minimal_options $DG_TORTURE_OPTIONS]
-set guality_dg_torture_options [guality_transform_options $guality_dg_torture_options]
+set guality_dg_torture_options [guality_transform_options $DG_TORTURE_OPTIONS]
 set guality_lto_torture_options [guality_transform_options $LTO_TORTURE_OPTIONS]
 torture-init
 set-torture-options \
diff --git a/gcc/testsuite/gfortran.dg/guality/guality.exp b/gcc/testsuite/gfortran.dg/guality/guality.exp
index dad6e4d..f76347d 100644
--- a/gcc/testsuite/gfortran.dg/guality/guality.exp
+++ b/gcc/testsuite/gfortran.dg/guality/guality.exp
@@ -29,15 +29,10 @@ if ![info exists ::env(GUALITY_GDB_NAME)] {
 }
 report_gdb $::env(GUALITY_GDB_NAME) [info script]
 
-global DG_TORTURE_OPTIONS
-set save_dg_torture_options $DG_TORTURE_OPTIONS
-set DG_TORTURE_OPTIONS [guality_minimal_options $DG_TORTURE_OPTIONS]
-
 gfortran-dg-runtest [lsort [glob $srcdir/$subdir/*.\[fF\]{,90,95,03,08} ]] "" ""
 
 if [info exists guality_gdb_name] {
     unsetenv GUALITY_GDB_NAME
 }
 
-set DG_TORTURE_OPTIONS save_dg_torture_options
 dg-finish
diff --git a/gcc/testsuite/lib/gcc-gdb-test.exp b/gcc/testsuite/lib/gcc-gdb-test.exp
index b13d3ec..bb966d4 100644
--- a/gcc/testsuite/lib/gcc-gdb-test.exp
+++ b/gcc/testsuite/lib/gcc-gdb-test.exp
@@ -166,17 +166,3 @@ proc report_gdb { gdb loc } {
     }
     send_log -- "---\n$gdb_version\n---\n"
 }
-
-# Argument 0 is the option list.
-# Return the option list, ensuring that at least -Og is present.
-
-proc guality_minimal_options { args } {
-    set options [lindex $args 0]
-    foreach opt $options {
-	if { [regexp -- "-Og" $opt] } {
-	    return $options
-	}
-    }
-    
-    return [lappend options "-Og"]
-}