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

Commit e7a823be authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-3.19-rc-5' of... 

Merge tag 'linux-kselftest-3.19-rc-5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull kselftest fixes from Shuah Khan:
 "This update contains three patches to fix one compile error, and two
  run-time bugs.  One of them fixes infinite loop on ARM"

* tag 'linux-kselftest-3.19-rc-5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests/vm: fix link error for transhuge-stress test
  tools: testing: selftests: mq_perf_tests: Fix infinite loop on ARM
  selftests/exec: allow shell return code of 126
parents 613d4cef f5db310d

tools/testing/selftests/exec/execveat.c

+13 −6
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static int _check_execveat_fail(int fd, const char *path, int flags, 
}



static int check_execveat_invoked_rc(int fd, const char *path, int flags,

				     int expected_rc)

				     int expected_rc, int expected_rc2)

{

	int status;

	int rc;
@@ -98,9 +98,10 @@ static int check_execveat_invoked_rc(int fd, const char *path, int flags, 
			child, status);

		return 1;

	}

	if (WEXITSTATUS(status) != expected_rc) {

		printf("[FAIL] (child %d exited with %d not %d)\n",

			child, WEXITSTATUS(status), expected_rc);

	if ((WEXITSTATUS(status) != expected_rc) &&

	    (WEXITSTATUS(status) != expected_rc2)) {

		printf("[FAIL] (child %d exited with %d not %d nor %d)\n",

			child, WEXITSTATUS(status), expected_rc, expected_rc2);

		return 1;

	}

	printf("[OK]\n");
@@ -109,7 +110,7 @@ static int check_execveat_invoked_rc(int fd, const char *path, int flags, 


static int check_execveat(int fd, const char *path, int flags)

{

	return check_execveat_invoked_rc(fd, path, flags, 99);

	return check_execveat_invoked_rc(fd, path, flags, 99, 99);

}



static char *concat(const char *left, const char *right)
@@ -192,9 +193,15 @@ static int check_execveat_pathmax(int dot_dfd, const char *src, int is_script) 
	 * Execute as a long pathname relative to ".".  If this is a script,

	 * the interpreter will launch but fail to open the script because its

	 * name ("/dev/fd/5/xxx....") is bigger than PATH_MAX.

	 *

	 * The failure code is usually 127 (POSIX: "If a command is not found,

	 * the exit status shall be 127."), but some systems give 126 (POSIX:

	 * "If the command name is found, but it is not an executable utility,

	 * the exit status shall be 126."), so allow either.

	 */

	if (is_script)

		fail += check_execveat_invoked_rc(dot_dfd, longpath, 0, 127);

		fail += check_execveat_invoked_rc(dot_dfd, longpath, 0,

						  127, 126);

	else

		fail += check_execveat(dot_dfd, longpath, 0);

tools/testing/selftests/mqueue/mq_perf_tests.c

+1 −2
Original line number Diff line number Diff line
@@ -536,10 +536,9 @@ int main(int argc, char *argv[]) 
{

	struct mq_attr attr;

	char *option, *next_option;

	int i, cpu;

	int i, cpu, rc;

	struct sigaction sa;

	poptContext popt_context;

	char rc;

	void *retval;



	main_thread = pthread_self();

tools/testing/selftests/vm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ BINARIES += transhuge-stress 


all: $(BINARIES)

%: %.c

	$(CC) $(CFLAGS) -o $@ $^

	$(CC) $(CFLAGS) -o $@ $^ -lrt



run_tests: all

	@/bin/sh ./run_vmtests || (echo "vmtests: [FAIL]"; exit 1)