svn commit: trunk/busybox: miscutils testsuite

[vda at busybox.net]

Author: vda
Date: 2008-03-22 10:46:16 -0700 (Sat, 22 Mar 2008)
New Revision: 21455

Log:
taskset: fix false failure in testsuite



Modified:
   trunk/busybox/miscutils/taskset.c
   trunk/busybox/testsuite/taskset.tests


Changeset:
Modified: trunk/busybox/miscutils/taskset.c
===================================================================
--- trunk/busybox/miscutils/taskset.c	2008-03-22 17:26:35 UTC (rev 21454)
+++ trunk/busybox/miscutils/taskset.c	2008-03-22 17:46:16 UTC (rev 21455)
@@ -50,6 +50,11 @@
 	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;

Modified: trunk/busybox/testsuite/taskset.tests
===================================================================
--- trunk/busybox/testsuite/taskset.tests	2008-03-22 17:26:35 UTC (rev 21454)
+++ trunk/busybox/testsuite/taskset.tests	2008-03-22 17:46:16 UTC (rev 21455)
@@ -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" "" ""