summaryrefslogtreecommitdiffstats
path: root/systemtest/testcases_open/test_select/test.sh
diff options
context:
space:
mode:
authorDimitar Misev <d.misev@jacobs-university.de>2011-02-11 10:33:35 +0000
committerwww-data <www-data@ubuntu.localdomain>2011-02-16 10:01:18 +0100
commit054f18a0e07c429609aae393f6bde67f21f9b82c (patch)
tree225352b98851647a91c6a91297194452bee92601 /systemtest/testcases_open/test_select/test.sh
parent93445fe29563387538a4529d61922d8b814d240f (diff)
downloadrasdaman-upstream-054f18a0e07c429609aae393f6bde67f21f9b82c.tar.gz
rasdaman-upstream-054f18a0e07c429609aae393f6bde67f21f9b82c.tar.xz
rasdaman-upstream-054f18a0e07c429609aae393f6bde67f21f9b82c.zip
systemtest fixes
Diffstat (limited to 'systemtest/testcases_open/test_select/test.sh')
-rwxr-xr-xsystemtest/testcases_open/test_select/test.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/systemtest/testcases_open/test_select/test.sh b/systemtest/testcases_open/test_select/test.sh
index 0553a25..1b086d2 100755
--- a/systemtest/testcases_open/test_select/test.sh
+++ b/systemtest/testcases_open/test_select/test.sh
@@ -83,10 +83,10 @@
echo "Test by:"$PROGNAME $QUERY_DIR $ORACLE_DIR $LOG_DIR" at "`date`|tee $LOG
#---------------------------Precondition------------------------------------------
# check the Postgres
-ps -e | grep --quiet -w postmaster
+ps -e | grep --quiet -w postgres
if [ $? -ne 0 ]
then
- echo no postmaster available|tee -a $LOG
+ echo no postgres available|tee -a $LOG
exit $CODE_FAIL
fi
@@ -197,7 +197,7 @@ fi
echo creating test collection $TEST_RGB2... | tee -a $LOG
$RASQL -q 'create collection '$TEST_RGB2' RGBSet' --user $USERNAME --passwd $PASSWORD || echo Error creating collection $TEST_RGB2| tee -a $LOG
-if $RASQL -q "select r from RAS_COLLECTIONNAMES as r" --out string|grep -w test_rgb
+if $RASQL -q "select r from RAS_COLLECTIONNAMES as r" --out string|grep -w $TEST_RGB2
then
echo create collection $TEST_RGB2 RGBSet successfully ... | tee -a $LOG
else
@@ -219,7 +219,7 @@ else
fi
fi
#==========================test by queries==================================================
- if [ ! -f $QUERY_DIR/*.rasql ]
+ if [ ! -f "$QUERY_DIR/*.rasql" ]
then
echo "there is no rasql for test in the "$QUERY_DIR
else
@@ -276,4 +276,4 @@ fi
exit $CODE_OK
else
exit $CODE_FAIL
- fi \ No newline at end of file
+ fi