diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-11-03 12:30:12 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-11-03 12:30:12 +0100 |
commit | 294cbd05e32990c3b1a62be27441fc719edebbab (patch) | |
tree | 9e543bcfdaa183343f18714a256d3fd5c88d3b5c /tools/testing/selftests/splice | |
parent | be96b316deff35e119760982c43af74e606fa143 (diff) | |
parent | 5cb0512c02ecd7e6214e912e4c150f4219ac78e0 (diff) | |
download | op-kernel-dev-294cbd05e32990c3b1a62be27441fc719edebbab.zip op-kernel-dev-294cbd05e32990c3b1a62be27441fc719edebbab.tar.gz |
Merge branch 'linus' into perf/urgent, to pick up dependent commits
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/testing/selftests/splice')
-rw-r--r-- | tools/testing/selftests/splice/Makefile | 1 | ||||
-rw-r--r-- | tools/testing/selftests/splice/default_file_splice_read.c | 1 | ||||
-rwxr-xr-x | tools/testing/selftests/splice/default_file_splice_read.sh | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/tools/testing/selftests/splice/Makefile b/tools/testing/selftests/splice/Makefile index 7e1187e..e519b15 100644 --- a/tools/testing/selftests/splice/Makefile +++ b/tools/testing/selftests/splice/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 TEST_PROGS := default_file_splice_read.sh TEST_GEN_PROGS_EXTENDED := default_file_splice_read diff --git a/tools/testing/selftests/splice/default_file_splice_read.c b/tools/testing/selftests/splice/default_file_splice_read.c index 01dd609..a3c6e56 100644 --- a/tools/testing/selftests/splice/default_file_splice_read.c +++ b/tools/testing/selftests/splice/default_file_splice_read.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #define _GNU_SOURCE #include <fcntl.h> diff --git a/tools/testing/selftests/splice/default_file_splice_read.sh b/tools/testing/selftests/splice/default_file_splice_read.sh index 1ea2ade..490db5a 100755 --- a/tools/testing/selftests/splice/default_file_splice_read.sh +++ b/tools/testing/selftests/splice/default_file_splice_read.sh @@ -1,4 +1,5 @@ #!/bin/sh +# SPDX-License-Identifier: GPL-2.0 n=`./default_file_splice_read </dev/null | wc -c` test "$n" = 0 && exit 0 |