OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kselftest fixes for: 3.19-rc5 

This update contains 3 patches to fix one compile error,
 and two run-time bugs. One of them fixes infinite loop
 on ARM.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUtVidAAoJEAsCRMQNDUMcUiAP/inLnr7pl9TX3bOWBE7NAb34
 Xf70i9wozKC0ZQmfkfIMKwB4iJmapu4u73U0PvdEx+EULRLj2v/DvzAJDbTjczRo
 /XtHJfq+fdewjQjn2z4Z+kMj9QblA79wgmBps/YgV+6y+pAoiluGyNPFv3t3CszF
 IkJfPNkKUXr8g2y4/2/rP8nl6XQnmEdm4cN3vWLDTQFBd38+zeGvWnAej2I5XWOn
 0wa1DeDWhzRsEFIsW970xOD6DPw9KyN9N5IOPxRP7OzNRxMysbS7xrksclyCHmQu
 qmsSMscuLXrwmZvai2JHppEkxcnQQGb0gh/I/SICniF4S36nZzsW1GTqiDBLwS1i
 S8iadd4kS3hu8KLXHO5SH5Jtq7sQdxol1mLLrkkXSccoFWR64wFuia0ifcQxUh4j
 8bibMBDf/auO2K5b4b+kqK9wwflxZRpO3HKslrBmy3DKEXfu2jJ6KiofnFYgcjhx
 1uKfwqDz4MU1o6qgw4IMBMW8GfSAai8tQ1B3IJ0aAQpS5ZLlaG6bYCwqu+eo8Wba
 /3SW48EUwlxVHH09nax0TVzmtPZaWheTO8cpRG+Oeg0Nn6pO0PyX2531qApYp/JR
 sUk6OoCUz50yhqMtNozmcK1S6w5kDaVySkrr/Wc6p5HcMhav4OWWWTJ5Hze5kypp
 XnAd9OyI/AzJKZq51i6a
 =nVlg
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2015-01-14 08:09:14 +13:00
parent 613d4cefbb f5db310d77
commit e7a823be2a
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tools/testing/selftests/exec/execveat.c
View File

@ -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, 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 status;
int rc; int rc;
@ -98,9 +98,10 @@ static int check_execveat_invoked_rc(int fd, const char *path, int flags,
child, status); child, status);
return 1; return 1;
} }
if (WEXITSTATUS(status) != expected_rc) { if ((WEXITSTATUS(status) != expected_rc) &&
printf("[FAIL] (child %d exited with %d not %d)\n", (WEXITSTATUS(status) != expected_rc2)) {
child, WEXITSTATUS(status), expected_rc); printf("[FAIL] (child %d exited with %d not %d nor %d)\n",
child, WEXITSTATUS(status), expected_rc, expected_rc2);
return 1; return 1;
} }
printf("[OK]\n"); 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) 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) 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, * Execute as a long pathname relative to ".". If this is a script,
* the interpreter will launch but fail to open the script because its * the interpreter will launch but fail to open the script because its
* name ("/dev/fd/5/xxx....") is bigger than PATH_MAX. * 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) 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 else
fail += check_execveat(dot_dfd, longpath, 0); fail += check_execveat(dot_dfd, longpath, 0);

3
tools/testing/selftests/mqueue/mq_perf_tests.c
View File

@ -536,10 +536,9 @@ int main(int argc, char *argv[])
{ {
struct mq_attr attr; struct mq_attr attr;
char *option, *next_option; char *option, *next_option;
int i, cpu; int i, cpu, rc;
struct sigaction sa; struct sigaction sa;
poptContext popt_context; poptContext popt_context;
char rc;
void *retval; void *retval;
main_thread = pthread_self(); main_thread = pthread_self();

2
tools/testing/selftests/vm/Makefile
View File

@ -7,7 +7,7 @@ BINARIES += transhuge-stress
all: $(BINARIES) all: $(BINARIES)
%: %.c %: %.c
$(CC) $(CFLAGS) -o $@ $^ $(CC) $(CFLAGS) -o $@ $^ -lrt
run_tests: all run_tests: all
@/bin/sh ./run_vmtests || (echo "vmtests: [FAIL]"; exit 1) @/bin/sh ./run_vmtests || (echo "vmtests: [FAIL]"; exit 1)