This Go testsuite patch adds a -I. argument when compiling sources in
a directory.  This tells the compiler to import packages in the
current directory first, which is what we want in the testsuite.
Bootstrapped and ran Go testsuite on x86_64-pc-linux-gnu.  Committed
to mainline.

Ian

* go.test/go-test.exp (go-gc-tests): Add -I. when building all
sources in a directory (errorcheckdir, compiledir, rundir,
rundircmpout).
5c642e8b52c0508730a6273f0828e8c10b1be057
diff --git a/gcc/testsuite/go.test/go-test.exp 
b/gcc/testsuite/go.test/go-test.exp
index 067f309a296..8f17cb3db71 100644
--- a/gcc/testsuite/go.test/go-test.exp
+++ b/gcc/testsuite/go.test/go-test.exp
@@ -648,7 +648,7 @@ proc go-gc-tests { } {
                set last [lindex $packages end]
                set packages [lreplace $packages end end]
                foreach p $packages {
-                   dg-test -keep-output [lrange $p 1 end] "-O" "-w 
$DEFAULT_GOCFLAGS"
+                   dg-test -keep-output [lrange $p 1 end] "-O -I." "-w 
$DEFAULT_GOCFLAGS"
                    lappend del "[file rootname [file tail [lindex $p 1]]].o"
                }
                errchk [lindex $last 1] "[lrange $last 2 end]"
@@ -692,7 +692,7 @@ proc go-gc-tests { } {
            if { [llength $packages] > 0 } {
                set del [list]
                foreach p $packages {
-                   dg-test -keep-output [lindex $p 1] "[lrange $p 2 end] -O" 
"-w $DEFAULT_GOCFLAGS"
+                   dg-test -keep-output [lindex $p 1] "[lrange $p 2 end] -O 
-I." "-w $DEFAULT_GOCFLAGS"
                    lappend del "[file rootname [file tail [lindex $p 1]]].o"
                }
                foreach f $del {
@@ -712,7 +712,7 @@ proc go-gc-tests { } {
                set last [lindex $packages end]
                set packages [lreplace $packages end end]
                foreach p $packages {
-                   dg-test -keep-output [lrange $p 1 end] "-O" "-w 
$DEFAULT_GOCFLAGS"
+                   dg-test -keep-output [lrange $p 1 end] "-O -I." "-w 
$DEFAULT_GOCFLAGS"
                    lappend del "[file rootname [file tail [lindex $p 1]]].o"
                }
                set dg-do-what-default "link"
@@ -737,11 +737,11 @@ proc go-gc-tests { } {
                set last [lindex $packages end]
                set packages [lreplace $packages end end]
                foreach p $packages {
-                   dg-test -keep-output [lrange $p 1 end] "-O" "-w 
$DEFAULT_GOCFLAGS"
+                   dg-test -keep-output [lrange $p 1 end] "-O -I." "-w 
$DEFAULT_GOCFLAGS"
                    lappend del "[file rootname [file tail [lindex $p 1]]].o"
                }
                set dg-do-what-default "link"
-               dg-test -keep-output [lrange $last 1 end] "$del -O" "-w 
$DEFAULT_GOCFLAGS"
+               dg-test -keep-output [lrange $last 1 end] "$del -O -I." "-w 
$DEFAULT_GOCFLAGS"
                set base "[file rootname [file tail [lindex $last 1]]]"
                set output_file "./$base.exe"
                lappend del $output_file

Reply via email to