diff options
| author | Denis Vlasenko | 2008-03-22 17:46:16 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2008-03-22 17:46:16 +0000 |
| commit | 45ecfc2f5cda05dc9a2091ac610af03a8314ca4a (patch) | |
| tree | c34722185ed149407cd0701957d4b562e2e84670 | |
| parent | b9d0f0c762b72ff4ca0e667b62c48b4b95b6126e (diff) | |
| download | busybox-45ecfc2f5cda05dc9a2091ac610af03a8314ca4a.zip busybox-45ecfc2f5cda05dc9a2091ac610af03a8314ca4a.tar.gz | |
taskset: fix false failure in testsuite
| -rw-r--r-- | miscutils/taskset.c | 5 | ||||
| -rwxr-xr-x | testsuite/taskset.tests | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/miscutils/taskset.c b/miscutils/taskset.c index 6247aa8..bf98ea1 100644 --- a/miscutils/taskset.c +++ b/miscutils/taskset.c @@ -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; diff --git a/testsuite/taskset.tests b/testsuite/taskset.tests index 6001c3e..a3757ab 100755 --- a/testsuite/taskset.tests +++ b/testsuite/taskset.tests @@ -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" "" "" |