diff options
| author | Karel Zak <kzak@redhat.com> | 2016-10-21 13:34:28 +0200 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2016-10-21 13:34:28 +0200 |
| commit | 25d08572da2b950c14a4820f5d581eaba957361f (patch) | |
| tree | e9ec68adc69491b84c40ab046070a5655a0b7f0d | |
| parent | 307546ed8b48da7a8d4583d8e6b4a68904d7900a (diff) | |
| parent | 4b439e2d00e006c29d784ceb4b7d02766996d230 (diff) | |
| download | util-linux-25d08572da2b950c14a4820f5d581eaba957361f.tar.gz | |
Merge branch 'test-fixes' of https://github.com/rudimeier/util-linux
* 'test-fixes' of https://github.com/rudimeier/util-linux:
build-sys: fix missing ncursesw message
tests: avoid &>> for bash compatibility
| -rw-r--r-- | configure.ac | 4 | ||||
| -rwxr-xr-x | tests/ts/schedutils/chrt | 2 | ||||
| -rwxr-xr-x | tests/ts/schedutils/chrt-non-root | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 66601ecf3c..8855e39a37 100644 --- a/configure.ac +++ b/configure.ac @@ -1807,7 +1807,7 @@ AC_ARG_ENABLE([pg], [], [UL_DEFAULT_ENABLE([pg], [no])] ) UL_BUILD_INIT([pg]) -UL_REQUIRES_HAVE([pg], [ncursesw, ncurses], [ncurses or ncursesw library]) +UL_REQUIRES_HAVE([pg], [ncursesw, ncurses], [ncursesw or ncurses library]) AM_CONDITIONAL([BUILD_PG], [test "x$build_pg" = xyes]) @@ -1817,7 +1817,7 @@ AC_ARG_ENABLE([setterm], ) UL_BUILD_INIT([setterm]) UL_REQUIRES_LINUX([setterm]) -UL_REQUIRES_HAVE([setterm], [ncursesw, ncurses], [ncurses or ncurses library]) +UL_REQUIRES_HAVE([setterm], [ncursesw, ncurses], [ncursesw or ncurses library]) AM_CONDITIONAL([BUILD_SETTERM], [test "x$build_setterm" = xyes]) # build_schedutils= is just configure-only variable to control diff --git a/tests/ts/schedutils/chrt b/tests/ts/schedutils/chrt index 9d13d53db5..333e12d76c 100755 --- a/tests/ts/schedutils/chrt +++ b/tests/ts/schedutils/chrt @@ -26,7 +26,7 @@ ts_skip_nonroot TS_KNOWN_FAIL="yes" function do_chrt { - $TS_CMD_CHRT $* $TS_CMD_CHRT --pid 0 | sed 's/.* policy: //; s/.* priority: //' &>> $TS_OUTPUT + $TS_CMD_CHRT $* $TS_CMD_CHRT --pid 0 | sed 's/.* policy: //; s/.* priority: //' >> $TS_OUTPUT 2>&1 } function skip_policy { diff --git a/tests/ts/schedutils/chrt-non-root b/tests/ts/schedutils/chrt-non-root index 4efb6f84bd..b120d30b26 100755 --- a/tests/ts/schedutils/chrt-non-root +++ b/tests/ts/schedutils/chrt-non-root @@ -25,7 +25,7 @@ ts_check_test_command "$TS_CMD_CHRT" TS_KNOWN_FAIL="yes" function do_chrt { - $TS_CMD_CHRT $* $TS_CMD_CHRT --pid 0 | sed 's/.* policy: //; s/.* priority: //' &>> $TS_OUTPUT + $TS_CMD_CHRT $* $TS_CMD_CHRT --pid 0 | sed 's/.* policy: //; s/.* priority: //' >> $TS_OUTPUT 2>&1 } function skip_policy { @@ -45,7 +45,7 @@ function cleanup_output { ts_init_subtest "batch-vs-nice" skip_policy SCHED_BATCH if [ $? == 0 ]; then - renice -n 5 -p $$ &>> $TS_OUTPUT + renice -n 5 -p $$ >> $TS_OUTPUT 2>&1 do_chrt --batch 0 cleanup_output ts_finalize_subtest |