Signed-off-by: Jiri Palecek <[email protected]> --- testcases/kernel/syscalls/syslog/syslog01 | 5 ++--- testcases/kernel/syscalls/syslog/syslog02 | 6 +++--- testcases/kernel/syscalls/syslog/syslog03 | 8 ++++---- testcases/kernel/syscalls/syslog/syslog04 | 4 ++-- testcases/kernel/syscalls/syslog/syslog05 | 4 ++-- testcases/kernel/syscalls/syslog/syslog06 | 6 +++--- testcases/kernel/syscalls/syslog/syslog07 | 10 +++++----- testcases/kernel/syscalls/syslog/syslog08 | 6 +++--- testcases/kernel/syscalls/syslog/syslog09 | 4 ++-- testcases/kernel/syscalls/syslog/syslog10 | 7 +++---- 10 files changed, 29 insertions(+), 31 deletions(-)
diff --git a/testcases/kernel/syscalls/syslog/syslog01 b/testcases/kernel/syscalls/syslog/syslog01 index 808cd22..c894b77 100755 --- a/testcases/kernel/syscalls/syslog/syslog01 +++ b/testcases/kernel/syscalls/syslog/syslog01 @@ -19,7 +19,7 @@ # 02/05/03 Modified - Manoj Iyer <[email protected]> use USCTEST macros # fixed bugs. # 07/26/05 Michael Reed <[email protected]> -# Made changes to account for the replacement of syslogd$ +# Made changes to account for the replacement of syslogd # with syslog-ng # ################################################################## @@ -61,7 +61,6 @@ cleanup() "$syslog_cmd" restart 2>&1 1>/dev/null } -$ sleep 2 @@ -112,7 +111,7 @@ syslog_case1() tst_resm TBROK "$CONFIG_FILE not found!" else #Pause if another LTP syslog test is running - while [ -e $CONFIG_FILE.ltpback ] $ + while [ -e $CONFIG_FILE.ltpback ] do if [ $(( wait_count-- )) -gt 0 ] then diff --git a/testcases/kernel/syscalls/syslog/syslog02 b/testcases/kernel/syscalls/syslog/syslog02 index f5cf5c1..52fd25d 100755 --- a/testcases/kernel/syscalls/syslog/syslog02 +++ b/testcases/kernel/syscalls/syslog/syslog02 @@ -20,7 +20,7 @@ # 02/05/03 Modified - Manoj Iyer <[email protected]> use USCTEST macros # fixed bugs. # 07/26/05 Michael Reed <[email protected]> -# Made changes to account for the replacement of syslogd$ +# Made changes to account for the replacement of syslogd # with syslog-ng # ################################################################## @@ -72,7 +72,7 @@ syslog_case2() echo tst_resm TINFO "syslog: Testing the messages of all levels" - $ + level_no=0 level="emerg alert crit err warning notice info debug" tst_resm TINFO "syslog: Testing whether messages are logged into log file" @@ -105,7 +105,7 @@ syslog_case2() tst_resm TBROK "$CONFIG_FILE not found!" else #Pause if another LTP syslog test is running - while [ -e $CONFIG_FILE.ltpback ] $ + while [ -e $CONFIG_FILE.ltpback ] do if [ $(( wait_count-- )) -gt 0 ] then diff --git a/testcases/kernel/syscalls/syslog/syslog03 b/testcases/kernel/syscalls/syslog/syslog03 index 4e6aef5..3d4d06d 100755 --- a/testcases/kernel/syscalls/syslog/syslog03 +++ b/testcases/kernel/syscalls/syslog/syslog03 @@ -20,7 +20,7 @@ # 02/05/03 Modified - Manoj Iyer <[email protected]> use USCTEST macros # fixed bugs. # 07/27/05 Michael Reed <[email protected]> -# Made changes to account for the replacement of syslogd$ +# Made changes to account for the replacement of syslogd # with syslog-ng on SLES # ################################################################## @@ -104,7 +104,7 @@ syslog_case3() tst_resm TBROK "$CONFIG_FILE not found!" else #Pause if another LTP syslog test is running - while [ -e $CONFIG_FILE.ltpback ] $ + while [ -e $CONFIG_FILE.ltpback ] do if [ $(( wait_count-- )) -gt 0 ] then @@ -130,7 +130,7 @@ syslog_case3() fi - # Create the configuration file specific to this test case.$ + # Create the configuration file specific to this test case. case "$CONFIG_FILE" in "/etc/syslog.conf" |\ "/etc/rsyslog.conf") @@ -166,7 +166,7 @@ syslog_case3() status_flag=1 return fi - sleep 2 $ + sleep 2 # check if /var/log/messages script exists diff --git a/testcases/kernel/syscalls/syslog/syslog04 b/testcases/kernel/syscalls/syslog/syslog04 index 6621a07..d5ae04a 100755 --- a/testcases/kernel/syscalls/syslog/syslog04 +++ b/testcases/kernel/syscalls/syslog/syslog04 @@ -20,7 +20,7 @@ # 02/05/03 Modified - Manoj Iyer <[email protected]> use USCTEST macros # fixed bugs. # 07/27/05 Michael Reed <[email protected]> -# Made changes to account for the replacement of syslogd$ +# Made changes to account for the replacement of syslogd # with syslog-ng # ################################################################## @@ -99,7 +99,7 @@ syslog_case4() tst_resm TBROK "$CONFIG_FILE not found!" else #Pause if another LTP syslog test is running - while [ -e $CONFIG_FILE.ltpback ] $ + while [ -e $CONFIG_FILE.ltpback ] do if [ $(( wait_count-- )) -gt 0 ] then diff --git a/testcases/kernel/syscalls/syslog/syslog05 b/testcases/kernel/syscalls/syslog/syslog05 index 1e54547..1f39565 100755 --- a/testcases/kernel/syscalls/syslog/syslog05 +++ b/testcases/kernel/syscalls/syslog/syslog05 @@ -20,7 +20,7 @@ # 02/05/03 Modified - Manoj Iyer <[email protected]> use USCTEST macros # fixed bugs. # 07/27/05 Michael Reed <[email protected]> -# Made changes to account for the replacement of syslogd$ +# Made changes to account for the replacement of syslogd # with syslog-ng # ################################################################## @@ -107,7 +107,7 @@ syslog_case5() tst_resm TBROK "$CONFIG_FILE not found!" else #Pause if another LTP syslog test is running - while [ -e $CONFIG_FILE.ltpback ] $ + while [ -e $CONFIG_FILE.ltpback ] do if [ $(( wait_count-- )) -gt 0 ] then diff --git a/testcases/kernel/syscalls/syslog/syslog06 b/testcases/kernel/syscalls/syslog/syslog06 index 2ead84f..90d0680 100755 --- a/testcases/kernel/syscalls/syslog/syslog06 +++ b/testcases/kernel/syscalls/syslog/syslog06 @@ -20,7 +20,7 @@ # 02/05/03 Modified - Manoj Iyer <[email protected]> use USCTEST macros # fixed bugs. # 07/27/05 Michael Reed <[email protected]> -# Made changes to account for the replacement of syslogd$ +# Made changes to account for the replacement of syslogd # with syslog-ng on SLES # ################################################################## @@ -60,7 +60,7 @@ fi tst_resm TINFO "restart $syslog_cmd" "$syslog_cmd" restart 2>&1 1>/dev/null } -$ + sleep 2 exit $status_flag @@ -110,7 +110,7 @@ syslog_case6() tst_resm TBROK "$CONFIG_FILE not found!" else #Pause if another LTP syslog test is running - while [ -e $CONFIG_FILE.ltpback ] $ + while [ -e $CONFIG_FILE.ltpback ] do if [ $(( wait_count-- )) -gt 0 ] then diff --git a/testcases/kernel/syscalls/syslog/syslog07 b/testcases/kernel/syscalls/syslog/syslog07 index 8dee20f..730bbc1 100755 --- a/testcases/kernel/syscalls/syslog/syslog07 +++ b/testcases/kernel/syscalls/syslog/syslog07 @@ -20,14 +20,14 @@ # 02/05/03 Modified - Manoj Iyer <[email protected]> use USCTEST macros # fixed bugs. # 07/26/05 Michael Reed <[email protected]> -# Made changes to account for the replacement of syslogd$ +# Made changes to account for the replacement of syslogd # with syslog-ng # ################################################################## # case 7: Test the priorities.... # # # # o Add lowest prority level i.e debug level entry to # -# configuration file. # $ +# configuration file. # # o For syslog-ng the priority is set to all # # because of the format of syslog-ng.conf # # The format of the tests is the same, all levels of # @@ -129,7 +129,7 @@ then tst_resm TBROK "$CONFIG_FILE not found!" else #Pause if another LTP syslog test is running - while [ -e $CONFIG_FILE.ltpback ] $ + while [ -e $CONFIG_FILE.ltpback ] do if [ $(( wait_count-- )) -gt 0 ] then @@ -196,7 +196,7 @@ else notice_old=0 info_old=0 debug_old=0 -fi$ +fi # Call syslogtst. It will send the messages of all levels. syslogtst 7 2>/dev/null @@ -207,7 +207,7 @@ fi$ sleep 2 # check if /var/log/maillog script exists -# find /var/log/ |grep maillog 2>&1 1>/dev/null$ +# find /var/log/ |grep maillog 2>&1 1>/dev/null # RC=$? # if [ $RC -ne 0 ] # then diff --git a/testcases/kernel/syscalls/syslog/syslog08 b/testcases/kernel/syscalls/syslog/syslog08 index 6719e52..f917682 100755 --- a/testcases/kernel/syscalls/syslog/syslog08 +++ b/testcases/kernel/syscalls/syslog/syslog08 @@ -20,7 +20,7 @@ # 02/05/03 Modified - Manoj Iyer <[email protected]> use USCTEST macros # fixed bugs. # 07/26/05 Michael Reed <[email protected]> -# Made changes to account for the replacement of syslogd$ +# Made changes to account for the replacement of syslogd # with syslog-ng # ################################################################## @@ -109,7 +109,7 @@ syslog_case8() tst_resm TBROK "$CONFIG_FILE not found!" else #Pause if another LTP syslog test is running - while [ -e $CONFIG_FILE.ltpback ] $ + while [ -e $CONFIG_FILE.ltpback ] do if [ $(( wait_count-- )) -gt 0 ] then @@ -184,7 +184,7 @@ syslog_case8() old_mail_check=0 fi - # syslogtst has to be called with one more$ + # syslogtst has to be called with one more # additional facility argument(1-6) syslogtst 8 $facility_no 2>/dev/null if [ $? -ne 0 ]; then diff --git a/testcases/kernel/syscalls/syslog/syslog09 b/testcases/kernel/syscalls/syslog/syslog09 index a757bc4..9e4c9f1 100755 --- a/testcases/kernel/syscalls/syslog/syslog09 +++ b/testcases/kernel/syscalls/syslog/syslog09 @@ -20,7 +20,7 @@ # 02/05/03 Modified - Manoj Iyer <[email protected]> use USCTEST macros # fixed bugs. # 07/27/05 Michael Reed <[email protected]> -# Made changes to account for the replacement of syslogd$ +# Made changes to account for the replacement of syslogd # with syslog-ng # ################################################################## @@ -104,7 +104,7 @@ syslog_case9() tst_resm TBROK "$CONFIG_FILE not found!" else #Pause if another LTP syslog test is running - while [ -e $CONFIG_FILE.ltpback ] $ + while [ -e $CONFIG_FILE.ltpback ] do if [ $(( wait_count-- )) -gt 0 ] then diff --git a/testcases/kernel/syscalls/syslog/syslog10 b/testcases/kernel/syscalls/syslog/syslog10 index ae5ada4..3a19ad3 100755 --- a/testcases/kernel/syscalls/syslog/syslog10 +++ b/testcases/kernel/syscalls/syslog/syslog10 @@ -20,7 +20,7 @@ # 02/05/03 Modified - Manoj Iyer <[email protected]> use USCTEST macros # fixed bugs. # 07/26/05 Michael Reed <[email protected]> -# Made changes to account for the replacement of syslogd$ +# Made changes to account for the replacement of syslogd # with syslog-ng # ################################################################## @@ -61,7 +61,7 @@ cleanup() tst_resm TINFO "restart $syslog_cmd" $syslog_cmd restart 2>&1 1>/dev/null } -$ + sleep 2 exit $status_flag @@ -107,7 +107,7 @@ syslog_case10() tst_resm TBROK "$CONFIG_FILE not found!" else #Pause if another LTP syslog test is running - while [ -e $CONFIG_FILE.ltpback ]$ + while [ -e $CONFIG_FILE.ltpback ] do if [ $(( wait_count-- )) -gt 0 ] then @@ -153,7 +153,6 @@ syslog_case10() #Restart syslog $syslog_cmd restart 2>&1 1>/dev/null - $ # check if /var/log/messages script exists if ! [ -e /var/log/messages ] -- 1.6.2 ------------------------------------------------------------------------------ Crystal Reports - New Free Runtime and 30 Day Trial Check out the new simplified licensign option that enables unlimited royalty-free distribution of the report engine for externally facing server and web deployment. http://p.sf.net/sfu/businessobjects _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
