diff options
| author | Tom Tromey <tromey@redhat.com> | 2007-01-03 21:53:41 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2007-01-03 21:53:41 +0000 |
| commit | fb6eb0652bc583abae1cf94dec32b153f25ddf84 (patch) | |
| tree | 69406b03671c86eea60f384bf12c58fa5707bafa | |
| parent | 20bc0a45aa4013e2393e7522658e899733a5b7f7 (diff) | |
* testsuite/libjava.cni/cni.exp (gcj_cni_compile_cxx_to_o): Add -Igcj/gcj-eclipse-merge-branch
for srcdir.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcj/gcj-eclipse-merge-branch@120400 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/testsuite/libjava.cni/cni.exp | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 305009fb9d8..5e5fa4eb5ad 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 2007-01-03 Tom Tromey <tromey@redhat.com> + * testsuite/libjava.cni/cni.exp (gcj_cni_compile_cxx_to_o): Add -I + for srcdir. + +2007-01-03 Tom Tromey <tromey@redhat.com> + * testsuite/*: Added many .jar and .h files. * testsuite/libjava.special/special.exp (gcj_special_try_compiler): New proc. diff --git a/libjava/testsuite/libjava.cni/cni.exp b/libjava/testsuite/libjava.cni/cni.exp index 8d0bc83f2f4..61fee3b0200 100644 --- a/libjava/testsuite/libjava.cni/cni.exp +++ b/libjava/testsuite/libjava.cni/cni.exp @@ -4,13 +4,13 @@ # of options to pass to the compiler. Returns 0 on failure, 1 on # success. proc gcj_cni_compile_cxx_to_o {file {options {}}} { - global srcdir + global srcdir subdir set name [file rootname [file tail $file]] set oname ${name}.o # Find the generated header. - lappend options "additional_flags=-I. -I.." + lappend options "additional_flags=-I. -I.. -I$srcdir/$subdir" # Find libgcj headers. lappend options "additional_flags=-I$srcdir/.." |