[PATCH v2] Cleanup: membarrier selftest

[PATCH v2] Cleanup: membarrier selftest

[Mathieu Desnoyers]

As per Michael Ellerman's comments, we don't need to specify the rule
in the Makefile, the implicit one will do the same. Also, the
"__EXPORTED_HEADERS__" include is not needed, because we build the
test against the installed kernel headers, not the kernel headers.
Include <unistd.h> rather than the rather specific
<asm-generic/unistd.h> (the former header is located in a standard
location and includes the latter).

My own cleanups: re-use "$(TEST_PROGS)" in the clean target rather than
spelling the executable twice. Include <syscall.h> rather than
<sys/syscall.h> (the former header is located in a standard location
and includes the latter).

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers-vg+e7yoeK/dWk0Htik3J/w@public.gmane.org>
CC: Michael Ellerman <mpe-Gsx/Oe8HsFggBc27wqDAHg@public.gmane.org>
CC: Andrew Morton <akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>
CC: linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
CC: Pranith Kumar <bobby.prani-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
CC: Shuah Khan <shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org>
--
Changes since v1:
- Add Changelog.
---
 tools/testing/selftests/membarrier/Makefile          | 7 +++----
 tools/testing/selftests/membarrier/membarrier_test.c | 5 +----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/tools/testing/selftests/membarrier/Makefile b/tools/testing/selftests/membarrier/Makefile
index 877a503..a1a9708 100644
--- a/tools/testing/selftests/membarrier/Makefile
+++ b/tools/testing/selftests/membarrier/Makefile
@@ -1,11 +1,10 @@
 CFLAGS += -g -I../../../../usr/include/
 
-all:
-	$(CC) $(CFLAGS) membarrier_test.c -o membarrier_test
-
 TEST_PROGS := membarrier_test
 
+all: $(TEST_PROGS)
+
 include ../lib.mk
 
 clean:
-	$(RM) membarrier_test
+	$(RM) $(TEST_PROGS)
diff --git a/tools/testing/selftests/membarrier/membarrier_test.c b/tools/testing/selftests/membarrier/membarrier_test.c
index dde3125..535f0fe 100644
--- a/tools/testing/selftests/membarrier/membarrier_test.c
+++ b/tools/testing/selftests/membarrier/membarrier_test.c
@@ -1,9 +1,6 @@
 #define _GNU_SOURCE
-#define __EXPORTED_HEADERS__
-
 #include <linux/membarrier.h>
-#include <asm-generic/unistd.h>
-#include <sys/syscall.h>
+#include <syscall.h>
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
-- 
1.9.1

Re: [PATCH v2] Cleanup: membarrier selftest

[Shuah Khan]

On 09/08/2015 01:21 PM, Mathieu Desnoyers wrote:
> As per Michael Ellerman's comments, we don't need to specify the rule
> in the Makefile, the implicit one will do the same. Also, the
> "__EXPORTED_HEADERS__" include is not needed, because we build the
> test against the installed kernel headers, not the kernel headers.
> Include <unistd.h> rather than the rather specific
> <asm-generic/unistd.h> (the former header is located in a standard
> location and includes the latter).
> 
> My own cleanups: re-use "$(TEST_PROGS)" in the clean target rather than
> spelling the executable twice. Include <syscall.h> rather than
> <sys/syscall.h> (the former header is located in a standard location
> and includes the latter).

Please refine this changelog. Reference to comments belongs in the
Changes since section. Please rephrase to not include reference to
comments. Please do the same for "My own cleanups:". Get rid of it.

thanks,
-- Shuah
> 
> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers-vg+e7yoeK/dWk0Htik3J/w@public.gmane.org>
> CC: Michael Ellerman <mpe-Gsx/Oe8HsFggBc27wqDAHg@public.gmane.org>
> CC: Andrew Morton <akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>
> CC: linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> CC: Pranith Kumar <bobby.prani-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> CC: Shuah Khan <shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org>
> --
> Changes since v1:
> - Add Changelog.
> ---
>  tools/testing/selftests/membarrier/Makefile          | 7 +++----
>  tools/testing/selftests/membarrier/membarrier_test.c | 5 +----
>  2 files changed, 4 insertions(+), 8 deletions(-)
> 
> diff --git a/tools/testing/selftests/membarrier/Makefile b/tools/testing/selftests/membarrier/Makefile
> index 877a503..a1a9708 100644
> --- a/tools/testing/selftests/membarrier/Makefile
> +++ b/tools/testing/selftests/membarrier/Makefile
> @@ -1,11 +1,10 @@
>  CFLAGS += -g -I../../../../usr/include/
>  
> -all:
> -	$(CC) $(CFLAGS) membarrier_test.c -o membarrier_test
> -
>  TEST_PROGS := membarrier_test
>  
> +all: $(TEST_PROGS)
> +
>  include ../lib.mk
>  
>  clean:
> -	$(RM) membarrier_test
> +	$(RM) $(TEST_PROGS)
> diff --git a/tools/testing/selftests/membarrier/membarrier_test.c b/tools/testing/selftests/membarrier/membarrier_test.c
> index dde3125..535f0fe 100644
> --- a/tools/testing/selftests/membarrier/membarrier_test.c
> +++ b/tools/testing/selftests/membarrier/membarrier_test.c
> @@ -1,9 +1,6 @@
>  #define _GNU_SOURCE
> -#define __EXPORTED_HEADERS__
> -
>  #include <linux/membarrier.h>
> -#include <asm-generic/unistd.h>
> -#include <sys/syscall.h>
> +#include <syscall.h>
>  #include <stdio.h>
>  #include <errno.h>
>  #include <string.h>
> 


-- 
Shuah Khan
Sr. Linux Kernel Developer
Open Source Innovation Group
Samsung Research America (Silicon Valley)
shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org | (970) 217-8978