[PATCH] Remove duplicate ifunc benchtests.

[Ondřej Bílka]

On Tue, Nov 26, 2013 at 04:08:18PM +0000, Will Newton wrote:
> On 25 November 2013 09:27, Siddhesh Poyarekar <siddhesh@redhat.com> wrote:
> > On Tue, Nov 12, 2013 at 11:16:25AM +0100, Ondřej Bílka wrote:
> >> Hi,
> >>
> >> Current benchmarks print same data twice, when ifunc is not defined it
> >> covers only some implementations and when it is defined then all
> >> implementations are tested (results of ifunc/nonifunc may differ a lot
> >> but that is a separate bug report.)
> >>
> >> This can be solved by dropping a ifunc files and defining TEST_IFUNC
> >> unconditionally.
> >>
> >> OK to commit?
> >
> > Looks OK to me.
> >
> >> diff --git a/benchtests/bench-string.h b/benchtests/bench-string.h
> >> index 53e796a..46b4138 100644
> >> --- a/benchtests/bench-string.h
> >> +++ b/benchtests/bench-string.h
> >> @@ -17,6 +17,7 @@
> >>     <http://www.gnu.org/licenses/>.  */
> >>
> >>  #include <sys/cdefs.h>
> >> +#define TEST_IFUNC 1
> >>
> >>  typedef struct
> >>  {
> >
> > Please post an additional patch to just remove TEST_IFUNC altogether,
> > assuming it to be 1.
> 
> It also appears that benchtests/bench-strsep-ifunc.c was added to the
> tree between this patch being created and committed.
> 
Thanks, I deleted it as follows


diff --git a/ChangeLog b/ChangeLog
index 5927ebb..49df74a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -95,6 +95,7 @@
 	* benchtests/bench-strnlen-ifunc.c: Likewise.
 	* benchtests/bench-strpbrk-ifunc.c: Likewise.
 	* benchtests/bench-strrchr-ifunc.c: Likewise.
+	* benchtests/bench-strsep-ifunc.c: Likewise.
 	* benchtests/bench-strspn-ifunc.c: Likewise.
 	* benchtests/bench-strstr-ifunc.c: Likewise.
 
diff --git a/benchtests/bench-strsep-ifunc.c b/benchtests/bench-strsep-ifunc.c
deleted file mode 100644
index 2d475bc..0000000
--- a/benchtests/bench-strsep-ifunc.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Measure IFUNC implementations of strsep function.
-   Copyright (C) 2013 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#define TEST_IFUNC 1
-#include "bench-strsep.c"