From: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Date: Mon, 16 Apr 2012 10:14:40 +0000 (+0000)
Subject: Fix plugin testsuite, remove uses of TODO_dump_func (PR testsuite/52948)
X-Git-Tag: misc/gccgo-go1_1_2~3479
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3be74079134b4fde672bdb875636a9b5f95da7ba;p=thirdparty%2Fgcc.git

Fix plugin testsuite, remove uses of TODO_dump_func (PR testsuite/52948)

	* lib/plugin-support.exp (plugin-test-execute): Properly determine
	testcase name.
	Use fail, pass instead of unresolved.
	Don't log $optstr.

	PR testsuite/52948
	* g++.dg/plugin/dumb_plugin.c (pass_dumb_plugin_example): Remove
	TODO_dump_func.
	* g++.dg/plugin/selfassign.c (pass_warn_self_assign): Likewise.
	* gcc.dg/plugin/one_time_plugin.c (one_pass): Likewise.
	* gcc.dg/plugin/selfassign.c (pass_warn_self_assign): Likewise.

From-SVN: r186490
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9b35b60e1d72..847f90e815b6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,17 @@
+2012-04-16  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* lib/plugin-support.exp (plugin-test-execute): Properly determine
+	testcase name.
+	Use fail, pass instead of unresolved.
+	Don't log $optstr.
+
+	PR testsuite/52948
+	* g++.dg/plugin/dumb_plugin.c (pass_dumb_plugin_example): Remove
+	TODO_dump_func.
+	* g++.dg/plugin/selfassign.c (pass_warn_self_assign): Likewise.
+	* gcc.dg/plugin/one_time_plugin.c (one_pass): Likewise.
+	* gcc.dg/plugin/selfassign.c (pass_warn_self_assign): Likewise.
+
 2012-04-16  Janus Weil  <janus@gcc.gnu.org>
 
 	PR fortran/52968
diff --git a/gcc/testsuite/g++.dg/plugin/dumb_plugin.c b/gcc/testsuite/g++.dg/plugin/dumb_plugin.c
index 5bbd5d790fe4..8913e8694e34 100644
--- a/gcc/testsuite/g++.dg/plugin/dumb_plugin.c
+++ b/gcc/testsuite/g++.dg/plugin/dumb_plugin.c
@@ -72,7 +72,7 @@ static struct gimple_opt_pass pass_dumb_plugin_example =
     0,                                    /* properties_provided */
     0,                                    /* properties_destroyed */
     0,                                    /* todo_flags_start */
-    TODO_dump_func                        /* todo_flags_finish */
+    0					  /* todo_flags_finish */
   }
 };
 
diff --git a/gcc/testsuite/g++.dg/plugin/selfassign.c b/gcc/testsuite/g++.dg/plugin/selfassign.c
index 84d2801d2021..feb4130e5320 100644
--- a/gcc/testsuite/g++.dg/plugin/selfassign.c
+++ b/gcc/testsuite/g++.dg/plugin/selfassign.c
@@ -276,7 +276,7 @@ static struct gimple_opt_pass pass_warn_self_assign =
     0,                                    /* properties_provided */
     0,                                    /* properties_destroyed */
     0,                                    /* todo_flags_start */
-    TODO_dump_func                        /* todo_flags_finish */
+    0					  /* todo_flags_finish */
   }
 };
 
diff --git a/gcc/testsuite/gcc.dg/plugin/one_time_plugin.c b/gcc/testsuite/gcc.dg/plugin/one_time_plugin.c
index 2c4cd497192a..4bd99f128305 100644
--- a/gcc/testsuite/gcc.dg/plugin/one_time_plugin.c
+++ b/gcc/testsuite/gcc.dg/plugin/one_time_plugin.c
@@ -42,7 +42,7 @@ struct gimple_opt_pass one_pass =
   0,                                    /* properties_provided */
   0,                                    /* properties_destroyed */
   0,                                    /* todo_flags_start */
-  TODO_dump_func                        /* todo_flags_finish */
+  0					/* todo_flags_finish */
   }
 };
 
diff --git a/gcc/testsuite/gcc.dg/plugin/selfassign.c b/gcc/testsuite/gcc.dg/plugin/selfassign.c
index 84d2801d2021..feb4130e5320 100644
--- a/gcc/testsuite/gcc.dg/plugin/selfassign.c
+++ b/gcc/testsuite/gcc.dg/plugin/selfassign.c
@@ -276,7 +276,7 @@ static struct gimple_opt_pass pass_warn_self_assign =
     0,                                    /* properties_provided */
     0,                                    /* properties_destroyed */
     0,                                    /* todo_flags_start */
-    TODO_dump_func                        /* todo_flags_finish */
+    0					  /* todo_flags_finish */
   }
 };
 
diff --git a/gcc/testsuite/lib/plugin-support.exp b/gcc/testsuite/lib/plugin-support.exp
index 7d04bf17fc07..fcbbb675c583 100644
--- a/gcc/testsuite/lib/plugin-support.exp
+++ b/gcc/testsuite/lib/plugin-support.exp
@@ -1,4 +1,4 @@
-#   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+#   Copyright (C) 2009, 2010, 2012 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
@@ -70,7 +70,8 @@ proc plugin-test-execute { plugin_src plugin_tests } {
     set base [file rootname $basename]
     set plugin_lib $base.so
 
-    verbose "Test the plugin $basename" 1
+    set testcase [dg-trim-dirname $srcdir $plugin_src]
+    verbose "Test the plugin $testcase" 1
 
     # Build the plugin itself
     set extra_flags [plugin-get-options $plugin_src]
@@ -113,8 +114,12 @@ proc plugin-test-execute { plugin_src plugin_tests } {
     set_ld_library_path_env_vars
 
     if { $status != 0 } then {
- 	unresolved "$basename compilation, $optstr"
+ 	fail "$testcase compilation"
+	# Strictly, this is wrong: the tests compiled with the plugin should
+	# become unresolved instead.
  	return
+    } else {
+	pass "$testcase compilation"
     }
 
     # Compile the input source files with the plugin