45ecfc2f5
Denis Vlasenko
2008-03-22
Subject
taskset: fix false failure in testsuite
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
miscutils/taskset.c+5 -0
| @@ -50,6 +50,11 @@ int taskset_main(int argc ATTRIBUTE_UNUSED, char **argv) | |
| char *pid_str; | |
| char *aff = aff; /* for compiler */ | |
| + | /* NB: we mimic util-linux's taskset: -p does not take |
| + | * an argument, i.e., "-pN" is NOT valid, only "-p N"! |
| + | * Indeed, util-linux-2.13-pre7 uses: |
| + | * getopt_long(argc, argv, "+pchV", ...), not "...p:..." */ |
| + | |
| opt_complementary = "-1"; /* at least 1 arg */ | |
| opt_p = getopt32(argv, "+p"); | |
| argv += optind; | |
testsuite/taskset.tests+2 -2
| @@ -7,8 +7,8 @@ | |
| a="taskset" | |
| # testing "test name" "opts" "expected result" "file inp" "stdin" | |
| - | testing "taskset (get from pid 1)" "$a -p1 >/dev/null;echo \$?" "0\n" "" "" |
| - | testing "taskset (invalid pid)" "$a -p0 >/dev/null 2>&1;echo \$?" "1\n" "" "" |
| + | testing "taskset (get from pid 1)" "$a -p 1 >/dev/null;echo \$?" "0\n" "" "" |
| + | testing "taskset (invalid pid)" "$a -p 0 >/dev/null 2>&1;echo \$?" "1\n" "" "" |
| testing "taskset (set_aff, needs CAP_SYS_NICE)" \ | |
| "$a 0x1 $SHELL -c $a\ -p\ \$$\|grep\ \"current\ affinity\ mask:\ 1\" >/dev/null;echo \$?" \ | |
| "0\n" "" "" | |