|
From: Enrico B. <enr...@us...> - 2002-03-16 01:58:19
|
Update of /cvsroot/winbash/winbash/tests In directory usw-pr-cvs1:/tmp/cvs-serv20903 Modified Files: glob-test glob.right input-line.sh run-dollars run-exp-tests run-glob-test run-ifs-tests run-input-test run-minus-e run-new-exp run-precedence run-set-e-test run-strip run-varenv varenv.sh Log Message: fixed tests to work under win32 platforms Index: glob-test =================================================================== RCS file: /cvsroot/winbash/winbash/tests/glob-test,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- glob-test 11 Mar 2002 01:47:05 -0000 1.4 +++ glob-test 16 Mar 2002 01:58:15 -0000 1.5 @@ -6,7 +6,7 @@ echo expect "$@" } -TESTDIR=/tmp/glob-test +TESTDIR=$TEMP/glob-test rm -rf $TESTDIR mkdir $TESTDIR builtin cd $TESTDIR @@ -82,15 +82,16 @@ recho [^a-c]* # Make sure that filenames with embedded globbing characters are handled -# properly -mkdir a\*b -> a\*b/ooo +# properly. This doesn not apply to windows, since globbing chars are not +# allowed in filenames +#mkdir a\*b +#touch a\*b/ooo -expect '<a*b/ooo>' -recho a\*b/* +#expect '<a*b/ooo>' +#recho a\*b/* -expect '<a*b/ooo>' -recho a\*?/* +#expect '<a*b/ooo>' +#recho a\*?/* expect '<no match>' cmd='echo !7' Index: glob.right =================================================================== RCS file: /cvsroot/winbash/winbash/tests/glob.right,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- glob.right 9 Mar 2002 04:43:16 -0000 1.2 +++ glob.right 16 Mar 2002 01:58:16 -0000 1.3 @@ -46,8 +46,6 @@ argv[1] = <d> argv[2] = <dd> argv[3] = <de> -argv[1] = <a*b/ooo> -argv[1] = <a*b/ooo> no match not there argv[1] = <abc> Index: input-line.sh =================================================================== RCS file: /cvsroot/winbash/winbash/tests/input-line.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- input-line.sh 9 Mar 2002 04:43:16 -0000 1.2 +++ input-line.sh 16 Mar 2002 01:58:16 -0000 1.3 @@ -1,4 +1,5 @@ echo before calling input-line.sub -../bash ./input-line.sub +$BASH ./input-line.sub << EOF this line for input-line.sub +EOF echo finished with input-line.sub Index: run-dollars =================================================================== RCS file: /cvsroot/winbash/winbash/tests/run-dollars,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- run-dollars 9 Mar 2002 04:43:17 -0000 1.2 +++ run-dollars 16 Mar 2002 01:58:16 -0000 1.3 @@ -1,3 +1,3 @@ -../bash ./dollar-star.sh a b > x 2>&1 -../bash ./dollar-at.sh a b >>x 2>&1 +$BASH ./dollar-star.sh a b > x 2>&1 +$BASH ./dollar-at.sh a b >>x 2>&1 diff x dollar.right && rm -f x Index: run-exp-tests =================================================================== RCS file: /cvsroot/winbash/winbash/tests/run-exp-tests,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- run-exp-tests 9 Mar 2002 04:43:17 -0000 1.2 +++ run-exp-tests 16 Mar 2002 01:58:16 -0000 1.3 @@ -1,2 +1,2 @@ -../bash ./exp-tests | grep -v '^expect' > xx +$BASH ./exp-tests | grep -v '^expect' > xx diff xx exp.right && rm -f xx Index: run-glob-test =================================================================== RCS file: /cvsroot/winbash/winbash/tests/run-glob-test,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- run-glob-test 9 Mar 2002 04:43:17 -0000 1.2 +++ run-glob-test 16 Mar 2002 01:58:16 -0000 1.3 @@ -1,4 +1,4 @@ PATH=$PATH:`pwd` export PATH -../bash ./glob-test | grep -v '^expect' > xx +$BASH ./glob-test | grep -v '^expect' > xx diff xx glob.right && rm -f xx Index: run-ifs-tests =================================================================== RCS file: /cvsroot/winbash/winbash/tests/run-ifs-tests,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- run-ifs-tests 9 Mar 2002 04:43:17 -0000 1.2 +++ run-ifs-tests 16 Mar 2002 01:58:16 -0000 1.3 @@ -1,13 +1,13 @@ # # show that IFS is only applied to the result of expansions # -../bash ifs-test-1.sh > xx +$BASH ifs-test-1.sh > xx diff xx ./ifs.1.right -../bash ifs-test-2.sh > xx +$BASH ifs-test-2.sh > xx diff xx ./ifs.2.right -../bash ifs-test-3.sh > xx +$BASH ifs-test-3.sh > xx diff xx ./ifs.3.right rm -f xx Index: run-input-test =================================================================== RCS file: /cvsroot/winbash/winbash/tests/run-input-test,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- run-input-test 9 Mar 2002 04:43:17 -0000 1.2 +++ run-input-test 16 Mar 2002 01:58:16 -0000 1.3 @@ -1,2 +1,2 @@ -../bash < ./input-line.sh > xx +$BASH < ./input-line.sh > xx diff xx input.right && rm -f xx Index: run-minus-e =================================================================== RCS file: /cvsroot/winbash/winbash/tests/run-minus-e,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- run-minus-e 9 Mar 2002 04:43:17 -0000 1.2 +++ run-minus-e 16 Mar 2002 01:58:16 -0000 1.3 @@ -1,2 +1,2 @@ -../bash ./minus-e > xx +$BASH ./minus-e > xx diff xx minus-e.right && rm -f xx Index: run-new-exp =================================================================== RCS file: /cvsroot/winbash/winbash/tests/run-new-exp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- run-new-exp 9 Mar 2002 04:43:17 -0000 1.2 +++ run-new-exp 16 Mar 2002 01:58:16 -0000 1.3 @@ -1,2 +1,2 @@ -../bash ./new-exp.tests 2>&1 | grep -v '^expect' > xx +$BASH ./new-exp.tests 2>&1 | grep -v '^expect' > xx diff xx new-exp.right && rm -f xx Index: run-precedence =================================================================== RCS file: /cvsroot/winbash/winbash/tests/run-precedence,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- run-precedence 9 Mar 2002 04:43:17 -0000 1.2 +++ run-precedence 16 Mar 2002 01:58:16 -0000 1.3 @@ -1,2 +1,2 @@ -../bash ./precedence > xx +$BASH ./precedence > xx diff xx prec.right && rm -f xx Index: run-set-e-test =================================================================== RCS file: /cvsroot/winbash/winbash/tests/run-set-e-test,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- run-set-e-test 9 Mar 2002 04:43:17 -0000 1.2 +++ run-set-e-test 16 Mar 2002 01:58:16 -0000 1.3 @@ -1,2 +1,2 @@ -../bash ./set-e-test > xx +$BASH ./set-e-test > xx diff xx set-e.right && rm -f xx Index: run-strip =================================================================== RCS file: /cvsroot/winbash/winbash/tests/run-strip,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- run-strip 9 Mar 2002 04:43:17 -0000 1.2 +++ run-strip 16 Mar 2002 01:58:16 -0000 1.3 @@ -1,2 +1,2 @@ -../bash ./strip.tests > xx +$BASH ./strip.tests > xx diff xx strip.right && rm -f xx Index: run-varenv =================================================================== RCS file: /cvsroot/winbash/winbash/tests/run-varenv,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- run-varenv 9 Mar 2002 04:43:17 -0000 1.2 +++ run-varenv 16 Mar 2002 01:58:16 -0000 1.3 @@ -1,2 +1,2 @@ -../bash ./varenv.sh | grep -v '^expect' > xx +$BASH ./varenv.sh | grep -v '^expect' > xx diff xx varenv.right && rm -f xx Index: varenv.sh =================================================================== RCS file: /cvsroot/winbash/winbash/tests/varenv.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- varenv.sh 9 Mar 2002 04:43:17 -0000 1.2 +++ varenv.sh 16 Mar 2002 01:58:16 -0000 1.3 @@ -45,7 +45,7 @@ echo $HOME expect $HOME -HOME=/a/b/c /bin/echo $HOME +HOME=/a/b/c echo $HOME expect $HOME echo $HOME @@ -59,7 +59,7 @@ # This should echo $HOME 9, NOT /a/b/c 9 expect "$HOME" -HOME=/a/b/c /bin/echo $HOME c=9 +HOME=/a/b/c echo $HOME c=9 expect "$HOME 7" echo $HOME $c |
