diff options
author | Joern Engel <joern@logfs.org> | 2013-07-03 18:09:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-03 19:08:07 -0400 |
commit | 51a1d16563fb6488ae1f30d31f62abc6aa50b268 (patch) | |
tree | 41ae763e706690676168f189fbae0b56f8c2d62e /tools | |
parent | 0786f7b225ba1edd801dc4bfbf6191d058b943a2 (diff) |
selftests: exit 1 on failure
In case this ever gets scripted, it should return 0 on success and 1 on
failure. Parsing the output should be left to meatbags.
Signed-off-by: Joern Engel <joern@logfs.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/testing/selftests/vm/Makefile | 2 | ||||
-rw-r--r-- | tools/testing/selftests/vm/run_vmtests | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile index 436d2e81868b..7d4792799043 100644 --- a/tools/testing/selftests/vm/Makefile +++ b/tools/testing/selftests/vm/Makefile | |||
@@ -8,7 +8,7 @@ all: hugepage-mmap hugepage-shm map_hugetlb thuge-gen | |||
8 | $(CC) $(CFLAGS) -o $@ $^ | 8 | $(CC) $(CFLAGS) -o $@ $^ |
9 | 9 | ||
10 | run_tests: all | 10 | run_tests: all |
11 | @/bin/sh ./run_vmtests || echo "vmtests: [FAIL]" | 11 | @/bin/sh ./run_vmtests || (echo "vmtests: [FAIL]"; exit 1) |
12 | 12 | ||
13 | clean: | 13 | clean: |
14 | $(RM) hugepage-mmap hugepage-shm map_hugetlb | 14 | $(RM) hugepage-mmap hugepage-shm map_hugetlb |
diff --git a/tools/testing/selftests/vm/run_vmtests b/tools/testing/selftests/vm/run_vmtests index 4c53cae6c273..7a9072d52e70 100644 --- a/tools/testing/selftests/vm/run_vmtests +++ b/tools/testing/selftests/vm/run_vmtests | |||
@@ -4,6 +4,7 @@ | |||
4 | #we need 256M, below is the size in kB | 4 | #we need 256M, below is the size in kB |
5 | needmem=262144 | 5 | needmem=262144 |
6 | mnt=./huge | 6 | mnt=./huge |
7 | exitcode=0 | ||
7 | 8 | ||
8 | #get pagesize and freepages from /proc/meminfo | 9 | #get pagesize and freepages from /proc/meminfo |
9 | while read name size unit; do | 10 | while read name size unit; do |
@@ -41,6 +42,7 @@ echo "--------------------" | |||
41 | ./hugepage-mmap | 42 | ./hugepage-mmap |
42 | if [ $? -ne 0 ]; then | 43 | if [ $? -ne 0 ]; then |
43 | echo "[FAIL]" | 44 | echo "[FAIL]" |
45 | exitcode=1 | ||
44 | else | 46 | else |
45 | echo "[PASS]" | 47 | echo "[PASS]" |
46 | fi | 48 | fi |
@@ -55,6 +57,7 @@ echo "--------------------" | |||
55 | ./hugepage-shm | 57 | ./hugepage-shm |
56 | if [ $? -ne 0 ]; then | 58 | if [ $? -ne 0 ]; then |
57 | echo "[FAIL]" | 59 | echo "[FAIL]" |
60 | exitcode=1 | ||
58 | else | 61 | else |
59 | echo "[PASS]" | 62 | echo "[PASS]" |
60 | fi | 63 | fi |
@@ -67,6 +70,7 @@ echo "--------------------" | |||
67 | ./map_hugetlb | 70 | ./map_hugetlb |
68 | if [ $? -ne 0 ]; then | 71 | if [ $? -ne 0 ]; then |
69 | echo "[FAIL]" | 72 | echo "[FAIL]" |
73 | exitcode=1 | ||
70 | else | 74 | else |
71 | echo "[PASS]" | 75 | echo "[PASS]" |
72 | fi | 76 | fi |
@@ -75,3 +79,4 @@ fi | |||
75 | umount $mnt | 79 | umount $mnt |
76 | rm -rf $mnt | 80 | rm -rf $mnt |
77 | echo $nr_hugepgs > /proc/sys/vm/nr_hugepages | 81 | echo $nr_hugepgs > /proc/sys/vm/nr_hugepages |
82 | exit $exitcode | ||