Merge branch 'master' into rand

tests/.gitignore

@@ -18,22 +18,26 @@
 /link
 /math
 /mem
-/setid
-/sleep
 /pipe
 /printf
 /rmdir
 /setid
+/setid
+/sleep
 /sprintf
-/stdlib/bsearch
-/stdlib/strtol
 /stdlib/a64l
+/stdlib/bsearch
 /stdlib/rand
-/string/strncmp
-/string/strcspn
+/stdlib/strtol
 /string/strchr
+/string/strcspn
+/string/strncmp
+/string/strpbrk
 /string/strrchr
 /string/strspn
+/string/strstr
+/string/strtok
+/string/strtok_r
 /unistd/getopt
 /unlink
 /waitpid