Ok..try it now.. I did git diff origin/cilkplus. Thanks,
Balaji V. Iyer. -----Original Message----- From: H.J. Lu [mailto:hjl.to...@gmail.com] Sent: Tuesday, September 06, 2011 12:37 PM To: Iyer, Balaji V Subject: Re: [Patch][Cilkplus branch] Adding include directory path to testsuite script Please use "git diff origin/cilkplus" to generate patch. On Tue, Sep 6, 2011 at 9:36 AM, H.J. Lu <hjl.to...@gmail.com> wrote: > On Tue, Sep 6, 2011 at 8:01 AM, Iyer, Balaji V <balaji.v.i...@intel.com> > wrote: >> Sure! Here is the fixed patch. > > It won't apply. Please make sure that it is against cilkplus branch. > > H.J. >> Thanks, >> >> Balaji V. Iyer. >> >> -----Original Message----- >> From: H.J. Lu [mailto:hjl.to...@gmail.com] >> Sent: Tuesday, September 06, 2011 10:57 AM >> To: Iyer, Balaji V >> Cc: gcc-patches@gcc.gnu.org >> Subject: Re: [Patch][Cilkplus branch] Adding include directory path >> to testsuite script >> >> You should just say "* g++.dg/cilk-plus/cilk_plus.exp: Likewise" since the >> change is the same as above. >> >> H.J. >> On Tue, Sep 6, 2011 at 7:45 AM, Iyer, Balaji V <balaji.v.i...@intel.com> >> wrote: >>> I fixed all the changed you have requested. Here is an updated patch. >>> >>> Thanks, >>> >>> Balaji V. Iyer. >>> >>> >>> -----Original Message----- >>> From: H.J. Lu [mailto:hjl.to...@gmail.com] >>> Sent: Tuesday, September 06, 2011 10:41 AM >>> To: Iyer, Balaji V >>> Cc: gcc-patches@gcc.gnu.org >>> Subject: Re: [Patch][Cilkplus branch] Adding include directory path >>> to testsuite script >>> >>> On Tue, Sep 6, 2011 at 7:30 AM, Iyer, Balaji V <balaji.v.i...@intel.com> >>> wrote: >>>> Attached, please find a patch with the modifications you have suggested >>>> (adding the info in Changelog.cilk). >>> >>> Please remove the extra blank line in ChangLog. ChangeLog should simply >>> say what you did, not why. >>> >>> H.J. >>> ---- >>>> Sorry for the mistake. >>>> >>>> Thanks, >>>> >>>> Balaji V. Iyer. >>>> >>>> >>>> -----Original Message----- >>>> From: H.J. Lu [mailto:hjl.to...@gmail.com] >>>> Sent: Tuesday, September 06, 2011 10:22 AM >>>> To: Iyer, Balaji V >>>> Cc: gcc-patches@gcc.gnu.org >>>> Subject: Re: [Patch][Cilkplus branch] Adding include directory path >>>> to testsuite script >>>> >>>> On Mon, Sep 5, 2011 at 9:52 PM, Iyer, Balaji V <balaji.v.i...@intel.com> >>>> wrote: >>>>> Hello Everyone, >>>>> This patch is for the Cilk Plus branch. It will add the include >>>>> directory path it the testsuite script (cilk_plus.exp) in both >>>>> gcc.dg/cilk-plus and g++.dg/cilk-plus directories. >>>>> >>>>> Thanking You, >>>>> >>>> >>>> ChangeLog entries are missing. >>>> > -- H.J.
diff --git a/gcc/testsuite/ChangeLog.cilk b/gcc/testsuite/ChangeLog.cilk index c9eac87..a602b88 100644 --- a/gcc/testsuite/ChangeLog.cilk +++ b/gcc/testsuite/ChangeLog.cilk @@ -1,3 +1,9 @@ +2011-09-05 Balaji V. Iyer. <balaji.v.i...@intel.com> + + * gcc.dg/cilk-plus/cilk_plus.exp: Added -I + $(src_dir)../../libcilkrts/include. Also removed -fsyntax-only + * g++.dg/cilk-plus/cilk_plus.exp: Likewise + 2011-08-15 Balaji V. Iyer. <balaji.v.i...@intel.com> * gcc.dg/cilk-plus/cilk-for.c: New diff --git a/gcc/testsuite/g++.dg/cilk-plus/cilk_plus.exp b/gcc/testsuite/g++.dg/cilk-plus/cilk_plus.exp index 9f91b0c..8a9fdd4 100644 --- a/gcc/testsuite/g++.dg/cilk-plus/cilk_plus.exp +++ b/gcc/testsuite/g++.dg/cilk-plus/cilk_plus.exp @@ -18,6 +18,6 @@ load_lib g++-dg.exp dg-init -dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.cpp]] "-fsyntax-only -w -lcilkrts -ldl " " " +dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.cpp]] " -w -lcilkrts -ldl -I $srcdir/../../libcilkrts/include " " " dg-finish diff --git a/gcc/testsuite/gcc.dg/cilk-plus/cilk_plus.exp b/gcc/testsuite/gcc.dg/cilk-plus/cilk_plus.exp index b228b65..dcf096e 100644 --- a/gcc/testsuite/gcc.dg/cilk-plus/cilk_plus.exp +++ b/gcc/testsuite/gcc.dg/cilk-plus/cilk_plus.exp @@ -18,6 +18,6 @@ load_lib gcc-dg.exp dg-init -dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] "-fsyntax-only -lcilkrts -ldl -std=c99" " " +dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] " -ldl -lcilkrts -I $srcdir/../../libcilkrts/include -std=c99 " " " dg-finish