|
From: <sv...@va...> - 2005-10-15 15:28:36
|
Author: njn Date: 2005-10-15 16:28:31 +0100 (Sat, 15 Oct 2005) New Revision: 4929 Log: Fix 'shell' for those lacking '.' in their $PATH, hopefully. Modified: trunk/none/tests/shell trunk/none/tests/shell.stderr.exp trunk/none/tests/shell.stdout.exp Modified: trunk/none/tests/shell =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/none/tests/shell 2005-10-15 13:01:21 UTC (rev 4928) +++ trunk/none/tests/shell 2005-10-15 15:28:31 UTC (rev 4929) @@ -7,35 +7,35 @@ #-----------------------------------------------------------------------= ----- =20 echo "Execute a directory" -x86/ +./x86/ =20 -echo "Execute a directory (2)" -x86 - echo "Execute a non-executable file" -shell.vgtest +./shell.vgtest =20 echo "Execute a script with a bad interpreter name" -shell_badinterp +./shell_badinterp =20 echo "Execute a binary file" -shell_binaryfile +./shell_binaryfile =20 echo "Execute a non-existent file" +./shell_nosuchfile + +echo "Execute a non-existent file (2)" shell_nosuchfile =20 #-----------------------------------------------------------------------= ----- # Shell scripts that should pass #-----------------------------------------------------------------------= ----- echo "Execute a valid script with a #! line" -shell_valid1 +./shell_valid1 =20 echo "Execute a valid script without a #! line" -shell_valid2 +./shell_valid2 =20 echo "Execute a valid script with #! but no interpname" -shell_valid3 +./shell_valid3 =20 echo "Execute a zero-length file" -shell_zerolength +./shell_zerolength =20 Modified: trunk/none/tests/shell.stderr.exp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/none/tests/shell.stderr.exp 2005-10-15 13:01:21 UTC (rev 4928) +++ trunk/none/tests/shell.stderr.exp 2005-10-15 15:28:31 UTC (rev 4929) @@ -1,8 +1,6 @@ =20 -./shell: x86/: is a directory +./shell: ./x86/: is a directory =20 -./shell: x86: command not found - ./shell: ./shell.vgtest: Permission denied =20 execve(0x........(./shell_badinterp), 0x........, 0x........) failed, er= rno 2 @@ -10,6 +8,8 @@ Add more stringent tests in PRE(sys_execve), or work out how to recover. ./shell: ./shell_binaryfile: cannot execute binary file =20 +./shell: ./shell_nosuchfile: No such file or directory + ./shell: shell_nosuchfile: command not found =20 =20 Modified: trunk/none/tests/shell.stdout.exp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/none/tests/shell.stdout.exp 2005-10-15 13:01:21 UTC (rev 4928) +++ trunk/none/tests/shell.stdout.exp 2005-10-15 15:28:31 UTC (rev 4929) @@ -1,9 +1,9 @@ Execute a directory -Execute a directory (2) Execute a non-executable file Execute a script with a bad interpreter name Execute a binary file Execute a non-existent file +Execute a non-existent file (2) Execute a valid script with a #! line Execute a valid script without a #! line Execute a valid script with #! but no interpname |