diff options
author | Chet Ramey <chet.ramey@case.edu> | 2015-05-15 11:04:28 -0400 |
---|---|---|
committer | Chet Ramey <chet.ramey@case.edu> | 2015-05-15 11:04:28 -0400 |
commit | 48abf0fdc980a0bb3f90ca007c6471b083211273 (patch) | |
tree | 96d8a07948a6038b4cac5581d6b99f40d797886e /tests | |
parent | 85ec0778f9d778e1820fb8c0e3e996f2d1103b45 (diff) | |
download | bash-48abf0fdc980a0bb3f90ca007c6471b083211273.tar.gz |
commit bash-20150424 snapshot
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/RUN-ONE-TEST | 2 | ||||
-rw-r--r-- | tests/exec.right | 2 | ||||
-rw-r--r-- | tests/trap.right | 6 | ||||
-rw-r--r-- | tests/vredir.right | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/tests/RUN-ONE-TEST b/tests/RUN-ONE-TEST index 72ec06a2..3efcf32d 100755 --- a/tests/RUN-ONE-TEST +++ b/tests/RUN-ONE-TEST @@ -1,4 +1,4 @@ -BUILD_DIR=/usr/local/build/bash/bash-current +BUILD_DIR=/usr/local/build/chet/bash/bash-current THIS_SH=$BUILD_DIR/bash PATH=$PATH:$BUILD_DIR diff --git a/tests/exec.right b/tests/exec.right index 54488bf8..74148daa 100644 --- a/tests/exec.right +++ b/tests/exec.right @@ -13,7 +13,7 @@ after exec1.sub: one two three 126 ./execscript: line 40: /: Is a directory 126 -/: /: is a directory +/: /: Is a directory 126 ./execscript: line 47: .: /: is a directory 1 diff --git a/tests/trap.right b/tests/trap.right index b3615646..8941e1cc 100644 --- a/tests/trap.right +++ b/tests/trap.right @@ -18,15 +18,15 @@ trap -- 'echo [$LINENO] debug' DEBUG [24] debug func[16] funcdebug funcdebug line -[26] debug +./trap.tests[26] funcdebug trap -- 'echo exiting' EXIT trap -- 'echo aborting' SIGHUP trap -- 'echo aborting' SIGINT trap -- 'echo aborting' SIGQUIT trap -- 'echo aborting' SIGABRT trap -- 'echo aborting' SIGTERM -trap -- 'echo [$LINENO] debug' DEBUG -[28] debug +trap -- 'echo ${FUNCNAME:-$0}[$LINENO] funcdebug' DEBUG +./trap.tests[28] funcdebug ./trap.tests[33] debug ./trap.tests[34] debug func2[30] debug diff --git a/tests/vredir.right b/tests/vredir.right index 07e02a7a..5e081bee 100644 --- a/tests/vredir.right +++ b/tests/vredir.right @@ -88,5 +88,5 @@ swizzle () } ok 1 ./vredir6.sub: redirection error: cannot duplicate fd: Invalid argument -./vredir6.sub: line 13: v: Invalid argument +./vredir6.sub: line 13: /dev/null: Invalid argument unset |