Hi, Version 2 fixes space and tab issues in the previous patch.
The patch fixes 2 bugs. The first one is in ln_test01, which always failed due to the expected result file is wrongly generated, ln01 1 FAIL: Test #1: ln -s failed. Reason: 3,4c3 < < /mnt/testarea/tst_ln.tmp1/d.0: --- > /mnt/testarea/tst_ln.tmp/d.0: ... The second one is in unzip01 caused by the recently introduced Makefile change named, [RFC]PATCH] Update unzip command test: build and run successfully without unzip http://article.gmane.org/gmane.linux.ltp/7635 The following lines, HAVE_ZIPTOOLS=$(shell which zip && which unzip && echo t) ifeq ($(HAVE_ZIPTOOLS),t) are not working correctly due to the variable is likely to expanded to, /usr/bin/zip /usr/bin/unzip t Signed-off-by: CAI Qian <[email protected]> --- testcases/commands/fileutils/ln/ln_tests.sh.orig 2008-12-30 22:36:33.000000000 +0800 +++ testcases/commands/fileutils/ln/ln_tests.sh 2009-03-13 19:27:03.000000000 +0800 @@ -147,8 +147,7 @@ fcnt=0 # index into files created in loop RC=0 # return code from commands - echo -n "$dirname" 1>>$LTPTMP/tst_ln.exp - echo "1:" 1>>$LTPTMP/tst_ln.exp + echo "$dirname:" 1>>$LTPTMP/tst_ln.exp echo "d.$dircnt" 1>>$LTPTMP/tst_ln.exp while [ $dircnt -lt $numdirs ] do @@ -213,7 +212,7 @@ ls -R $LTPTMP/tst_ln.tmp1 > $LTPTMP/tst_ln.out 2>&1 $LTPBIN/tst_resm TINFO "Test #1: creating expected output file" - creat_expout $numdirs $numfiles $LTPTMP/tst_ln.tmp + creat_expout $numdirs $numfiles $LTPTMP/tst_ln.tmp1 $LTPBIN/tst_resm TINFO \ "Test #1: comparing expected out and actual output file" --- testcases/commands/unzip/Makefile.orig 2009-02-26 21:10:54.000000000 +0800 +++ testcases/commands/unzip/Makefile 2009-03-13 19:27:36.000000000 +0800 @@ -1,5 +1,6 @@ # Only build and install if we have the zip and unzip commands -HAVE_ZIPTOOLS=$(shell which zip && which unzip && echo t) +HAVE_ZIPTOOLS=$(shell which zip >/dev/null 2>&1\ + && which unzip >/dev/null 2>&1 && echo t) ifeq ($(HAVE_ZIPTOOLS),t) BINS := unzip_tests.sh DEPS := tst_unzip_file.zip $(BINS) ------------------------------------------------------------------------------ Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are powering Web 2.0 with engaging, cross-platform capabilities. Quickly and easily build your RIAs with Flex Builder, the Eclipse(TM)based development software that enables intelligent coding and step-through debugging. Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
