Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cb7903e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-4.16-rc1' of... 

Merge tag 'linux-kselftest-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull kselftest updates from Shuah Khan:
 "This update to Kselftest consists of fixes, cleanups, and SPDX license
  additions"

* tag 'linux-kselftest-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests: vm: update .gitignore with missing generated file
  selftests/x86: Add <test_name>{,_32,_64} targets
  selftests: Fix loss of test output in run_kselftests.sh
  selftest: ftrace: Fix to add 256 kprobe events correctly
  selftest: ftrace: Fix to pick text symbols for kprobes
  selftests: media_tests: Add SPDX license identifier
  selftests: kselftest.h: Add SPDX license identifier
  selftests: kselftest_install.sh: Add SPDX license identifier
  selftests: gen_kselftest_tar.h: Add SPDX license identifier
  selftests: media_tests: Fix Makefile 'clean' target warning
  tools/testing: Fix trailing semicolon
  kselftest: fix OOM in memory compaction test
  selftests: seccomp: fix compile error seccomp_bpf
parents 23c35f48 0e9e327d

tools/testing/selftests/Makefile

+8 −1
Original line number Diff line number Diff line
@@ -116,8 +116,15 @@ ifdef INSTALL_PATH 


	@# Ask all targets to emit their test scripts

	echo "#!/bin/sh" > $(ALL_SCRIPT)

	echo "cd \$$(dirname \$$0)" >> $(ALL_SCRIPT)

	echo "BASE_DIR=\$$(realpath \$$(dirname \$$0))" >> $(ALL_SCRIPT)

	echo "cd \$$BASE_DIR" >> $(ALL_SCRIPT)

	echo "ROOT=\$$PWD" >> $(ALL_SCRIPT)

	echo "if [ \"\$$1\" = \"--summary\" ]; then" >> $(ALL_SCRIPT)

	echo "  OUTPUT=\$$BASE_DIR/output.log" >> $(ALL_SCRIPT)

	echo "  cat /dev/null > \$$OUTPUT" >> $(ALL_SCRIPT)

	echo "else" >> $(ALL_SCRIPT)

	echo "  OUTPUT=/dev/stdout" >> $(ALL_SCRIPT)

	echo "fi" >> $(ALL_SCRIPT)



	for TARGET in $(TARGETS); do \

		BUILD_TARGET=$$BUILD/$$TARGET;	\

tools/testing/selftests/ftrace/test.d/kprobe/multiple_kprobes.tc

+18 −3
Original line number Diff line number Diff line
@@ -12,9 +12,24 @@ case `uname -m` in 
  *) OFFS=0;;

esac



echo "Setup up to 256 kprobes"

grep t /proc/kallsyms | cut -f3 -d" " | grep -v .*\\..* | \

head -n 256 | while read i; do echo p ${i}+${OFFS} ; done > kprobe_events ||:

if [ -d events/kprobes ]; then

  echo 0 > events/kprobes/enable

  echo > kprobe_events

fi



N=0

echo "Setup up kprobes on first available 256 text symbols"

grep -i " t " /proc/kallsyms | cut -f3 -d" " | grep -v .*\\..* | \

while read i; do

  echo p ${i}+${OFFS} >> kprobe_events && N=$((N+1)) ||:

  test $N -eq 256 && break

done



L=`wc -l kprobe_events`

if [ $L -ne $N ]; then

  echo "The number of kprobes events ($L) is not $N"

  exit_fail

fi



echo 1 > events/kprobes/enable

echo 0 > events/kprobes/enable

tools/testing/selftests/gen_kselftest_tar.sh

+1 −3
Original line number Diff line number Diff line 
#!/bin/bash

#

# SPDX-License-Identifier: GPL-2.0

# gen_kselftest_tar

# Generate kselftest tarball

# Author: Shuah Khan <shuahkh@osg.samsung.com>

# Copyright (C) 2015 Samsung Electronics Co., Ltd.



# This software may be freely redistributed under the terms of the GNU

# General Public License (GPLv2).



# main

main()

{

tools/testing/selftests/kselftest.h

+1 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * kselftest.h:	kselftest framework return codes to include from

 *		selftests.
@@ -5,7 +6,6 @@ 
 * Copyright (c) 2014 Shuah Khan <shuahkh@osg.samsung.com>

 * Copyright (c) 2014 Samsung Electronics Co., Ltd.

 *

 * This file is released under the GPLv2.

 */

#ifndef __KSELFTEST_H

#define __KSELFTEST_H

tools/testing/selftests/kselftest_install.sh

+1 −3
Original line number Diff line number Diff line 
#!/bin/bash

# SPDX-License-Identifier: GPL-2.0

#

# Kselftest Install

# Install kselftest tests

# Author: Shuah Khan <shuahkh@osg.samsung.com>

# Copyright (C) 2015 Samsung Electronics Co., Ltd.



# This software may be freely redistributed under the terms of the GNU

# General Public License (GPLv2).



install_loc=`pwd`



main()