Skip to content
Snippets Groups Projects
Commit fb86b0b0 authored by Simon Rose's avatar Simon Rose
Browse files

Removed start/end lines since the error message can appear in weird spots

parent 504835e0
No related branches found
No related tags found
No related merge requests found
......@@ -79,7 +79,7 @@ function test_require {
iocsh_args="-l test/cellMods -c 'var requireDebug 1' -r $req_str"
if [ "$expected" = "-" ]; then
search_string="^Module $MODULENAME (not available|version $required not available|version $required not available \(but other versions are available\))\$"
search_string="Module $MODULENAME (not available|version $required not available|version $required not available \(but other versions are available\))"
else
search_string="^Loaded $MODULENAME version $expected\$"
fi
......@@ -91,11 +91,9 @@ function test_require {
# differently than the regular flow of output and sometimes will separate the strings that
# we are looking for. If we simply cut it out then we seem to be able to more consistently
# get meaningful tests.
#echo exit | eval iocsh.bash "$iocsh_args" |
# sed -e '1 h; 2,$ H; $! d; g' -e 's/Starting iocInit\niocRun: All initialization complete\n//' |
# $__SEARCH_COMMAND__ "${search_string}"
echo exit | eval iocsh.bash "$iocsh_args" |
sed -e '1 h; 2,$ H; $! d; g' -e 's/Starting iocInit\niocRun: All initialization complete\n//'
sed -e '1 h; 2,$ H; $! d; g' -e 's/Starting iocInit\niocRun: All initialization complete\n//' |
$__SEARCH_COMMAND__ "${search_string}"
}
function format_output {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment