tlevine/urchin
1
0
Fork 0
Code Issues 5 Pull Requests 1 Packages Projects Releases Wiki Activity

fix trap and shell list

Browse Source
This commit is contained in:
Thomas Levine 2016-03-06 14:23:04 +00:00
parent 12f975a0ca
commit fa6c660be1
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
urchin
View File

@ -49,7 +49,7 @@
set -e set -e
# Kill subprocesses on interrupt. # Kill subprocesses on interrupt.
trap "kill -$$" SIGHUP SIGINT SIGTERM trap "kill -$$; exit" HUP INT TERM
DEFAULT_SHELLS='sh bash dash mksh zsh' DEFAULT_SHELLS='sh bash dash mksh zsh'
if [ -n "${ZSH_VERSION}" ]; then if [ -n "${ZSH_VERSION}" ]; then
@ -517,7 +517,7 @@ validate_strings() {
main() { main() {
cycle_shell=true cycle_shell=true
shell_list="${urchin_tmp}"/shell_list shell_list="${urchin_tmp}"/shell_list
test_spec_list="${urchin_tmp}"/test_list test_arg_list="${urchin_tmp}"/test_list
run_in_series=false run_in_series=false
force=false force=false
exit_on_not_ok=false exit_on_not_ok=false
@ -576,7 +576,7 @@ main() {
urchin_exit 11;; urchin_exit 11;;
*) validate_strings "${1}" 'Test file names' *) validate_strings "${1}" 'Test file names'
validate_test_arg "${1}" validate_test_arg "${1}"
echo "${1}" >> "${test_spec_list}" ;; echo "${1}" >> "${test_arg_list}" ;;
esac esac
shift shift
done done
@ -643,8 +643,7 @@ main() {
while read seed; do while read seed; do
recurse "$(fullpath "${seed}")" "${root}" "${cycle_shell}" \ recurse "$(fullpath "${seed}")" "${root}" "${cycle_shell}" \
"${TEST_SHELL}" || break "${TEST_SHELL}" || break
break done < "${test_arg_list}"
done < "${shell_list}"
finish=$(date +%s) finish=$(date +%s)
test $(cat "${urchin_tmp}"/log | wc -l) -gt 0 || { test $(cat "${urchin_tmp}"/log | wc -l) -gt 0 || {