From: Subrata <sub...@us...> - 2009-01-22 08:47:37
|
Update of /cvsroot/ltp/ltp/testcases/kernel/syscalls/syslog In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1690/ltp/testcases/kernel/syscalls/syslog Modified Files: syslog01 syslog02 syslog03 syslog04 syslog05 syslog06 syslog07 syslog08 syslog09 syslog10 Log Message: [PATCH 1/6] Do not cleanup if it doesn't make sense: This is the first from the series of minor patches to syslog tests. Parts inspired by CAI Qian's remarks. Resend due to line-wrapping problems. - Check for existence of the backup file before moving it back, - Do not restart syslog daemon, if syslog command was not found, Signed-off-by: Jiri Palecek <jpa...@we...>. Index: syslog07 =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/syslog/syslog07,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** syslog07 20 Jan 2009 12:17:02 -0000 1.20 --- syslog07 22 Jan 2009 08:47:30 -0000 1.21 *************** *** 55,63 **** #Restore syslog.conf ! mv $CONFIG_FILE.ltpback $CONFIG_FILE #Restart syslog ! tst_resm TINFO "restart syslog" ! $syslog_cmd restart 2>&1 1>/dev/null --- 55,65 ---- #Restore syslog.conf ! [ -f "$CONFIG_FILE.ltpback" ] && mv "$CONFIG_FILE.ltpback" "$CONFIG_FILE" #Restart syslog ! [ -x "$syslog_cmd" ] && { ! tst_resm TINFO "restart $syslog_cmd" ! "$syslog_cmd" restart 2>&1 1>/dev/null ! } Index: syslog06 =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/syslog/syslog06,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** syslog06 20 Jan 2009 12:17:02 -0000 1.21 --- syslog06 22 Jan 2009 08:47:30 -0000 1.22 *************** *** 54,62 **** #Restore syslog.conf ! mv $CONFIG_FILE.ltpback $CONFIG_FILE #Restart syslog ! tst_resm TINFO "restart $syslog_cmd" ! $syslog_cmd restart 2>&1 1>/dev/null sleep 2 --- 54,64 ---- #Restore syslog.conf ! [ -f "$CONFIG_FILE.ltpback" ] && mv "$CONFIG_FILE.ltpback" "$CONFIG_FILE" #Restart syslog ! [ -x "$syslog_cmd" ] && { ! tst_resm TINFO "restart $syslog_cmd" ! "$syslog_cmd" restart 2>&1 1>/dev/null ! } sleep 2 Index: syslog05 =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/syslog/syslog05,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** syslog05 20 Jan 2009 12:17:02 -0000 1.21 --- syslog05 22 Jan 2009 08:47:30 -0000 1.22 *************** *** 54,62 **** #Restore syslog.conf ! mv $CONFIG_FILE.ltpback $CONFIG_FILE #Restart syslog ! tst_resm TINFO "restart $syslog_cmd" ! $syslog_cmd restart 2>&1 1>/dev/null sleep 2 --- 54,64 ---- #Restore syslog.conf ! [ -f "$CONFIG_FILE.ltpback" ] && mv "$CONFIG_FILE.ltpback" "$CONFIG_FILE" #Restart syslog ! [ -x "$syslog_cmd" ] && { ! tst_resm TINFO "restart $syslog_cmd" ! "$syslog_cmd" restart 2>&1 1>/dev/null ! } sleep 2 Index: syslog04 =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/syslog/syslog04,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** syslog04 20 Jan 2009 12:17:02 -0000 1.20 --- syslog04 22 Jan 2009 08:47:30 -0000 1.21 *************** *** 49,57 **** #Restore syslog.conf ! mv $CONFIG_FILE.ltpback $CONFIG_FILE #Restart syslog ! tst_resm TINFO "restart $syslog_cmd" ! $syslog_cmd restart 2>&1 1>/dev/null sleep 2 --- 49,59 ---- #Restore syslog.conf ! [ -f "$CONFIG_FILE.ltpback" ] && mv "$CONFIG_FILE.ltpback" "$CONFIG_FILE" #Restart syslog ! [ -x "$syslog_cmd" ] && { ! tst_resm TINFO "restart $syslog_cmd" ! "$syslog_cmd" restart 2>&1 1>/dev/null ! } sleep 2 Index: syslog10 =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/syslog/syslog10,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** syslog10 20 Jan 2009 12:17:02 -0000 1.20 --- syslog10 22 Jan 2009 08:47:30 -0000 1.21 *************** *** 55,64 **** #Restore syslog.conf ! mv $CONFIG_FILE.ltpback $CONFIG_FILE #Restart syslog ! tst_resm TINFO "restart $syslog_cmd" ! $syslog_cmd restart 2>&1 1>/dev/null ! sleep 2 --- 55,65 ---- #Restore syslog.conf ! [ -f "$CONFIG_FILE.ltpback" ] && mv $CONFIG_FILE.ltpback $CONFIG_FILE #Restart syslog ! [ -x "$syslog_cmd" ] && { ! tst_resm TINFO "restart $syslog_cmd" ! $syslog_cmd restart 2>&1 1>/dev/null ! } sleep 2 Index: syslog02 =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/syslog/syslog02,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** syslog02 20 Jan 2009 12:17:02 -0000 1.21 --- syslog02 22 Jan 2009 08:47:30 -0000 1.22 *************** *** 48,56 **** #Restore syslog.conf ! mv $CONFIG_FILE.ltpback $CONFIG_FILE #Restart syslog ! tst_resm TINFO "restart $syslog_cmd" ! $syslog_cmd restart 2>&1 1>/dev/null sleep 2 --- 48,58 ---- #Restore syslog.conf ! [ -f "$CONFIG_FILE.ltpback" ] && mv "$CONFIG_FILE.ltpback" "$CONFIG_FILE" #Restart syslog ! [ -x "$syslog_cmd" ] && { ! tst_resm TINFO "restart $syslog_cmd" ! "$syslog_cmd" restart 2>&1 1>/dev/null ! } sleep 2 Index: syslog01 =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/syslog/syslog01,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** syslog01 20 Jan 2009 12:17:02 -0000 1.19 --- syslog01 22 Jan 2009 08:47:30 -0000 1.20 *************** *** 54,62 **** #Restore syslog.conf ! mv $CONFIG_FILE.ltpback $CONFIG_FILE #Restart syslog ! tst_resm TINFO "restart $syslog_cmd" ! $syslog_cmd restart 2>&1 1>/dev/null --- 54,64 ---- #Restore syslog.conf ! [ -f "$CONFIG_FILE.ltpback" ] && mv "$CONFIG_FILE.ltpback" "$CONFIG_FILE" #Restart syslog ! [ -x "$syslog_cmd" ] && { ! tst_resm TINFO "restart $syslog_cmd" ! "$syslog_cmd" restart 2>&1 1>/dev/null ! } Index: syslog09 =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/syslog/syslog09,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** syslog09 20 Jan 2009 12:17:02 -0000 1.20 --- syslog09 22 Jan 2009 08:47:30 -0000 1.21 *************** *** 51,59 **** #Restore syslog.conf ! mv $CONFIG_FILE.ltpback $CONFIG_FILE #Restart syslog ! tst_resm TINFO "restart $syslog_cmd" ! $syslog_cmd restart 2>&1 1>/dev/null sleep 2 --- 51,61 ---- #Restore syslog.conf ! [ -f "$CONFIG_FILE.ltpback" ] && mv "$CONFIG_FILE.ltpback" "$CONFIG_FILE" #Restart syslog ! [ -x "$syslog_cmd" ] && { ! tst_resm TINFO "restart $syslog_cmd" ! "$syslog_cmd" restart 2>&1 1>/dev/null ! } sleep 2 Index: syslog08 =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/syslog/syslog08,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** syslog08 20 Jan 2009 12:17:02 -0000 1.20 --- syslog08 22 Jan 2009 08:47:30 -0000 1.21 *************** *** 54,62 **** #Restore syslog.conf ! mv $CONFIG_FILE.ltpback $CONFIG_FILE #Restart syslog ! tst_resm TINFO "restart $syslog_cmd" ! $syslog_cmd restart 2>&1 1>/dev/null sleep 2 --- 54,64 ---- #Restore syslog.conf ! [ -f "$CONFIG_FILE.ltpback" ] && mv "$CONFIG_FILE.ltpback" "$CONFIG_FILE" #Restart syslog ! [ -x "$syslog_cmd" ] && { ! tst_resm TINFO "restart $syslog_cmd" ! "$syslog_cmd" restart 2>&1 1>/dev/null ! } sleep 2 Index: syslog03 =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/syslog/syslog03,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** syslog03 20 Jan 2009 12:17:02 -0000 1.20 --- syslog03 22 Jan 2009 08:47:30 -0000 1.21 *************** *** 51,59 **** #Restore syslog.conf ! mv $CONFIG_FILE.ltpback $CONFIG_FILE #Restart syslog ! tst_resm TINFO "restart $syslog_cmd" ! $syslog_cmd restart 2>&1 1>/dev/null sleep 2 --- 51,61 ---- #Restore syslog.conf ! [ -f "$CONFIG_FILE.ltpback" ] && mv "$CONFIG_FILE.ltpback" "$CONFIG_FILE" #Restart syslog ! [ -x "$syslog_cmd" ] && { ! tst_resm TINFO "restart $syslog_cmd" ! "$syslog_cmd" restart 2>&1 1>/dev/null ! } sleep 2 |