[plugins] [patch] Add new testcases and dejagnu support for plugin mechanism

Le-Chun Wu lcwu@google.com
Tue Mar 24 21:20:00 GMT 2009


On Tue, Mar 24, 2009 at 1:03 PM, Joseph S. Myers
<joseph@codesourcery.com> wrote:
> On Tue, 24 Mar 2009, Le-Chun Wu wrote:
>>
>> Thanks for the pointer. I've modified plugin-support.exp to use the
>> host compiler. However, I couldn't seem to be able to figure out how
>> $HOSTCC gets set in struct-layout-1.exp, so I manually set it to gcc
>> in plugin-support.exp. If that's not the way to go, please let me
>> know.
>
> HOSTCC is set in site.exp which is created by gcc/Makefile.in or by
> whatever means someone doing installed-compiler testing creates site.exp.
> HOSTCFLAGS is set alongside HOSTCC.
>

Ah, yes, thanks for the explanation. And I also found out why HOSTCC
and HOSTCFLAGS didn't get set in my script in the first place -- I
forgot to declare them as globals. Anyway, enclosed below is the new
plugin-support.exp. (I didn't attach a full patch file again as other
files are not modified.) Thanks,

Le-chun

Index: gcc/testsuite/lib/plugin-support.exp
===================================================================
--- gcc/testsuite/lib/plugin-support.exp        (revision 0)
+++ gcc/testsuite/lib/plugin-support.exp        (revision 0)
@@ -0,0 +1,126 @@
+#   Copyright (C) 2009 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
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GCC; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.
+#
+
+# This file contains the support procedures for testing the plugin mechanism.
+
+load_lib dg.exp
+load_lib gcc.exp
+
+# The including .exp file must define these.
+global plugin_tool tool
+
+if ![info exists plugin_tool] {
+    error "plugin_tool is not specified."
+}
+
+if ![info exists tool] {
+    error "tool is not specified."
+}
+
+#
+# plugin-get-options -- process test directives
+#
+# SRC is the full pathname of the plugin source file.
+#
+proc plugin-get-options { src } {
+    # dg-options sets a variable called dg-extra-tool-flags.
+    set dg-extra-tool-flags ""
+
+    # dg-require-* sets dg-do-what.
+    upvar dg-do-what dg-do-what
+
+    set tmp [dg-get-options $src]
+    foreach op $tmp {
+       set cmd [lindex $op 0]
+       if { ![string compare "dg-options" $cmd] } {
+           set status [catch "$op" errmsg]
+           if { $status != 0 } {
+               perror "src: $errmsg for \"$op\"\n"
+               unresolved "$src: $errmsg for \"$op\""
+               return
+           }
+       } else {
+           # Ignore unrecognized dg- commands, but warn about them.
+           warning "plugin.exp does not support $cmd"
+       }
+   }
+
+    # Return flags to use for compiling the plugin source file
+    return ${dg-extra-tool-flags}
+}
+
+#
+# plugin-test-execute -- build the plugin first and then compile the
+# test files with the plugin.
+#
+# PLUGIN_SRC is the full pathname of the plugin source file.
+# PLUGIN_TESTS is a list of input test source files.
+#
+proc plugin-test-execute { plugin_src plugin_tests } {
+    global srcdir objdir
+    global plugin_tool tool
+    global verbose
+    global HOSTCC HOSTCFLAGS
+
+    set basename [file tail $plugin_src]
+    set base [file rootname $basename]
+    set plugin_lib $base.so
+
+    verbose "Test the plugin $basename" 1
+
+    #
+    # Build the plugin itself
+    #
+
+    set extra_flags [plugin-get-options $plugin_src]
+
+    # Note that the plugin test support currently only works when the GCC
+    # build tree is available. (We make sure that is the case in plugin.exp.)
+    # Once we have figured out how/where to package/install GCC header files
+    # for general plugin support, we should modify the following include paths
+    # accordingly.
+    set gcc_srcdir "$srcdir/../.."
+    set gcc_objdir "$objdir/../../.."
+    set includes "-I. -I${srcdir} -I${gcc_srcdir}/gcc -I${gcc_objdir}/gcc \
+                  -I${gcc_srcdir}/include -I${gcc_srcdir}/libcpp/include \
+                  -I${gcc_objdir}/gmp"
+
+    set optstr "$includes $extra_flags -DIN_GCC -shared"
+    set compline "$optstr $plugin_src -o $plugin_lib"
+
+    set status [remote_exec build "$HOSTCC $HOSTCFLAGS $compline"]
+    set status [lindex $status 0]
+
+    if { $status != 0 } {
+       unresolved "$basename compilation, $optstr"
+       return
+    }
+
+    #
+    # Compile the input source files with the plugin
+    #
+
+    global default_flags
+    set plugin_enabling_flags "-fplugin=./$plugin_lib"
+    dg-runtest $plugin_tests $plugin_enabling_flags $default_flags
+
+    #
+    # Clean up
+    #
+
+    remote_file build delete $plugin_lib
+}



More information about the Gcc-patches mailing list