From d9221e1053b59d7d38f42e69e5df360e2b041a89 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Tue, 14 May 2019 12:54:01 -0400 Subject: [PATCH] fix system test scripts --- .../spreader_simple_sanity.sh | 15 +++++++++++---- .../system_test_scripts/test_clip_limits.sh | 16 +++++++++++----- .../system_test_scripts/test_position_limits.sh | 15 +++++++++++---- 3 files changed, 33 insertions(+), 13 deletions(-) diff --git a/src/client/spark_test/system_test_scripts/spreader_simple_sanity.sh b/src/client/spark_test/system_test_scripts/spreader_simple_sanity.sh index 01f2a03de..66e563fb2 100644 --- a/src/client/spark_test/system_test_scripts/spreader_simple_sanity.sh +++ b/src/client/spark_test/system_test_scripts/spreader_simple_sanity.sh @@ -1,9 +1,16 @@ #!/bin/bash -rm -r ~/sparkdata/data/databases/ > /dev/null +if [ -d ~/sparkdata/ ] +then + sparkdata_dir=~/sparkdata +else + sparkdata_dir='/sparkdata' +fi -mv ~/sparkdata/conf/spark.conf ~/sparkdata/conf/spark.conf.bak -cat << EOF > ~/sparkdata/conf/spark.conf +rm -r $sparkdata_dir/data/databases/ > /dev/null + +mv $sparkdata_dir/conf/spark.conf $sparkdata_dir/conf/spark.conf.bak +cat << EOF > $sparkdata_dir/conf/spark.conf ExchangeSim { value { merge_with_md:false @@ -29,4 +36,4 @@ sleep 120 dotnet sparkcmd.dll test spreader_simple_sanity kill $pid -mv ~/sparkdata/conf/spark.conf.bak ~/sparkdata/conf/spark.conf \ No newline at end of file +mv $sparkdata_dir/conf/spark.conf.bak $sparkdata_dir/conf/spark.conf \ No newline at end of file diff --git a/src/client/spark_test/system_test_scripts/test_clip_limits.sh b/src/client/spark_test/system_test_scripts/test_clip_limits.sh index 8928e476d..18aae3d8c 100644 --- a/src/client/spark_test/system_test_scripts/test_clip_limits.sh +++ b/src/client/spark_test/system_test_scripts/test_clip_limits.sh @@ -1,10 +1,17 @@ #!/bin/bash -rm -r ~/sparkdata/data/databases/ > /dev/null +if [ -d ~/sparkdata/ ] +then + sparkdata_dir=~/sparkdata +else + sparkdata_dir='/sparkdata' +fi + +rm -r $sparkdata_dir/data/databases/ > /dev/null -mv ~/sparkdata/conf/spark.conf ~/sparkdata/conf/spark.conf.bak -cat << EOF > ~/sparkdata/conf/spark.conf +mv $sparkdata_dir/conf/spark.conf $sparkdata_dir/conf/spark.conf.bak +cat << EOF > $sparkdata_dir/conf/spark.conf ExchangeSim { value { merge_with_md:true @@ -19,7 +26,6 @@ cat << EOF > ~/sparkdata/conf/spark.conf } EOF - nohup ./sparkd run & pid=$! echo "sparkd pid: " $pid @@ -30,4 +36,4 @@ sleep 120 dotnet sparkcmd.dll test test_clip_limits kill $pid -mv ~/sparkdata/conf/spark.conf.bak ~/sparkdata/conf/spark.conf \ No newline at end of file +mv $sparkdata_dir/conf/spark.conf.bak $sparkdata_dir/conf/spark.conf \ No newline at end of file diff --git a/src/client/spark_test/system_test_scripts/test_position_limits.sh b/src/client/spark_test/system_test_scripts/test_position_limits.sh index 7a688b7fe..1ee160075 100644 --- a/src/client/spark_test/system_test_scripts/test_position_limits.sh +++ b/src/client/spark_test/system_test_scripts/test_position_limits.sh @@ -1,10 +1,17 @@ #!/bin/bash -rm -r ~/sparkdata/data/databases/ > /dev/null +if [ -d ~/sparkdata/ ] +then + sparkdata_dir=~/sparkdata +else + sparkdata_dir='/sparkdata' +fi + +rm -r $sparkdata_dir/data/databases/ > /dev/null -mv ~/sparkdata/conf/spark.conf ~/sparkdata/conf/spark.conf.bak -cat << EOF > ~/sparkdata/conf/spark.conf +mv $sparkdata_dir/conf/spark.conf $sparkdata_dir/conf/spark.conf.bak +cat << EOF > $sparkdata_dir/conf/spark.conf ExchangeSim { value { merge_with_md:true @@ -29,4 +36,4 @@ sleep 120 dotnet sparkcmd.dll test test_position_limits kill $pid -mv ~/sparkdata/conf/spark.conf.bak ~/sparkdata/conf/spark.conf \ No newline at end of file +mv $sparkdata_dir/conf/spark.conf.bak $sparkdata_dir/conf/spark.conf \ No newline at end of file