proc: return exit code 4 for skipped tests

Alexey Dobriyan · torvalds · commit 0338c838367b · 2019-03-05T21:07:21.000-08:00
Test harness uses 4 for SKIP, not 2. Link: http://lkml.kernel.org/r/20190108193108.GA12259@avx2 Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Cc: Shuah Khan <shuah@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
diff --git a/tools/testing/selftests/proc/proc-loadavg-001.c b/tools/testing/selftests/proc/proc-loadavg-001.c
@@ -30,7 +30,7 @@ int main(void)
 
 	if (unshare(CLONE_NEWPID) == -1) {
 		if (errno == ENOSYS || errno == EPERM)
-			return 2;
+			return 4;
 		return 1;
 	}
 
diff --git a/tools/testing/selftests/proc/proc-self-map-files-002.c b/tools/testing/selftests/proc/proc-self-map-files-002.c
@@ -63,7 +63,7 @@ int main(void)
 	p = mmap((void *)va, PAGE_SIZE, PROT_NONE, MAP_PRIVATE|MAP_FILE|MAP_FIXED, fd, 0);
 	if (p == MAP_FAILED) {
 		if (errno == EPERM)
-			return 2;
+			return 4;
 		return 1;
 	}
 
diff --git a/tools/testing/selftests/proc/proc-self-syscall.c b/tools/testing/selftests/proc/proc-self-syscall.c
@@ -39,7 +39,7 @@ int main(void)
 	fd = open("/proc/self/syscall", O_RDONLY);
 	if (fd == -1) {
 		if (errno == ENOENT)
-			return 2;
+			return 4;
 		return 1;
 	}
 
diff --git a/tools/testing/selftests/proc/proc-self-wchan.c b/tools/testing/selftests/proc/proc-self-wchan.c
@@ -27,7 +27,7 @@ int main(void)
 	fd = open("/proc/self/wchan", O_RDONLY);
 	if (fd == -1) {
 		if (errno == ENOENT)
-			return 2;
+			return 4;
 		return 1;
 	}
 
diff --git a/tools/testing/selftests/proc/read.c b/tools/testing/selftests/proc/read.c
@@ -126,7 +126,7 @@ int main(void)
 
 	d = opendir("/proc");
 	if (!d)
-		return 2;
+		return 4;
 	f(d, 0);
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ int main(void)`
`30`	`30`
`31`	`31`	`if (unshare(CLONE_NEWPID) == -1) {`
`32`	`32`	`if (errno == ENOSYS \|\| errno == EPERM)`
`33`		`- return 2;`
	`33`	`+ return 4;`
`34`	`34`	`return 1;`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ int main(void)`
`63`	`63`	`p = mmap((void *)va, PAGE_SIZE, PROT_NONE, MAP_PRIVATE\|MAP_FILE\|MAP_FIXED, fd, 0);`
`64`	`64`	`if (p == MAP_FAILED) {`
`65`	`65`	`if (errno == EPERM)`
`66`		`- return 2;`
	`66`	`+ return 4;`
`67`	`67`	`return 1;`
`68`	`68`	`}`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ int main(void)`
`39`	`39`	`fd = open("/proc/self/syscall", O_RDONLY);`
`40`	`40`	`if (fd == -1) {`
`41`	`41`	`if (errno == ENOENT)`
`42`		`- return 2;`
	`42`	`+ return 4;`
`43`	`43`	`return 1;`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ int main(void)`
`27`	`27`	`fd = open("/proc/self/wchan", O_RDONLY);`
`28`	`28`	`if (fd == -1) {`
`29`	`29`	`if (errno == ENOENT)`
`30`		`- return 2;`
	`30`	`+ return 4;`
`31`	`31`	`return 1;`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ int main(void)`
`126`	`126`
`127`	`127`	`d = opendir("/proc");`
`128`	`128`	`if (!d)`
`129`		`- return 2;`
	`129`	`+ return 4;`
`130`	`130`	`f(d, 0);`
`131`	`131`	`return 0;`
`132`	`132`	`}`