aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-03-22 17:46:16 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-03-22 17:46:16 +0000
commit45ecfc2f5cda05dc9a2091ac610af03a8314ca4a (patch)
treec34722185ed149407cd0701957d4b562e2e84670
parentb9d0f0c762b72ff4ca0e667b62c48b4b95b6126e (diff)
downloadbusybox-w32-45ecfc2f5cda05dc9a2091ac610af03a8314ca4a.tar.gz
busybox-w32-45ecfc2f5cda05dc9a2091ac610af03a8314ca4a.tar.bz2
busybox-w32-45ecfc2f5cda05dc9a2091ac610af03a8314ca4a.zip
taskset: fix false failure in testsuite
-rw-r--r--miscutils/taskset.c5
-rwxr-xr-xtestsuite/taskset.tests4
2 files changed, 7 insertions, 2 deletions
diff --git a/miscutils/taskset.c b/miscutils/taskset.c
index 6247aa869..bf98ea15d 100644
--- a/miscutils/taskset.c
+++ b/miscutils/taskset.c
@@ -50,6 +50,11 @@ int taskset_main(int argc ATTRIBUTE_UNUSED, char **argv)
50 char *pid_str; 50 char *pid_str;
51 char *aff = aff; /* for compiler */ 51 char *aff = aff; /* for compiler */
52 52
53 /* NB: we mimic util-linux's taskset: -p does not take
54 * an argument, i.e., "-pN" is NOT valid, only "-p N"!
55 * Indeed, util-linux-2.13-pre7 uses:
56 * getopt_long(argc, argv, "+pchV", ...), not "...p:..." */
57
53 opt_complementary = "-1"; /* at least 1 arg */ 58 opt_complementary = "-1"; /* at least 1 arg */
54 opt_p = getopt32(argv, "+p"); 59 opt_p = getopt32(argv, "+p");
55 argv += optind; 60 argv += optind;
diff --git a/testsuite/taskset.tests b/testsuite/taskset.tests
index 6001c3e32..a3757ab5b 100755
--- a/testsuite/taskset.tests
+++ b/testsuite/taskset.tests
@@ -7,8 +7,8 @@
7a="taskset" 7a="taskset"
8 8
9# testing "test name" "opts" "expected result" "file inp" "stdin" 9# testing "test name" "opts" "expected result" "file inp" "stdin"
10testing "taskset (get from pid 1)" "$a -p1 >/dev/null;echo \$?" "0\n" "" "" 10testing "taskset (get from pid 1)" "$a -p 1 >/dev/null;echo \$?" "0\n" "" ""
11testing "taskset (invalid pid)" "$a -p0 >/dev/null 2>&1;echo \$?" "1\n" "" "" 11testing "taskset (invalid pid)" "$a -p 0 >/dev/null 2>&1;echo \$?" "1\n" "" ""
12testing "taskset (set_aff, needs CAP_SYS_NICE)" \ 12testing "taskset (set_aff, needs CAP_SYS_NICE)" \
13 "$a 0x1 $SHELL -c $a\ -p\ \$$\|grep\ \"current\ affinity\ mask:\ 1\" >/dev/null;echo \$?" \ 13 "$a 0x1 $SHELL -c $a\ -p\ \$$\|grep\ \"current\ affinity\ mask:\ 1\" >/dev/null;echo \$?" \
14 "0\n" "" "" 14 "0\n" "" ""