Skip to content
Snippets Groups Projects
Commit 3b90fa09 authored by tpylak's avatar tpylak
Browse files

adapt integration-tests to Mac

SVN: 3630
parent 480d59bc
No related branches found
No related tags found
No related merge requests found
...@@ -452,7 +452,7 @@ function generate_test_data { ...@@ -452,7 +452,7 @@ function generate_test_data {
function copy_test_data { function copy_test_data {
local NAME=$1 local NAME=$1
local DIR=$2 local DIR=$2
cp -a $TEST_DATA/$NAME $DIR cp -RPp $TEST_DATA/$NAME $DIR
clean_svn $DIR/$NAME clean_svn $DIR/$NAME
} }
...@@ -486,7 +486,7 @@ function switch_sth { ...@@ -486,7 +486,7 @@ function switch_sth {
else else
echo "Stopping $dir, displaying errors from the log" echo "Stopping $dir, displaying errors from the log"
if [ "`cat $dir/log/* | grep ERROR | tee -a $ERR_LOG`" != "" ]; then if [ "`cat $dir/log/* | grep ERROR | tee -a $ERR_LOG`" != "" ]; then
if [ $report_error .eq $TRUE ]; then if [ $report_error -eq $TRUE ]; then
report_error $dir reported errors. report_error $dir reported errors.
cat $dir/log/* | grep ERROR >&2 cat $dir/log/* | grep ERROR >&2
fi fi
......
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