diff options
| author | Dimitar Misev <d.misev@jacobs-university.de> | 2011-02-11 10:33:35 +0000 |
|---|---|---|
| committer | www-data <www-data@ubuntu.localdomain> | 2011-02-16 10:01:18 +0100 |
| commit | 054f18a0e07c429609aae393f6bde67f21f9b82c (patch) | |
| tree | 225352b98851647a91c6a91297194452bee92601 /systemtest/testcases_mandatory | |
| parent | 93445fe29563387538a4529d61922d8b814d240f (diff) | |
| download | rasdaman-upstream-054f18a0e07c429609aae393f6bde67f21f9b82c.tar.gz rasdaman-upstream-054f18a0e07c429609aae393f6bde67f21f9b82c.tar.xz rasdaman-upstream-054f18a0e07c429609aae393f6bde67f21f9b82c.zip | |
systemtest fixes
Diffstat (limited to 'systemtest/testcases_mandatory')
4 files changed, 19 insertions, 19 deletions
diff --git a/systemtest/testcases_mandatory/test_conversion/test.sh b/systemtest/testcases_mandatory/test_conversion/test.sh index 997c73b..5c165d9 100755 --- a/systemtest/testcases_mandatory/test_conversion/test.sh +++ b/systemtest/testcases_mandatory/test_conversion/test.sh @@ -80,11 +80,11 @@ echo "Test by:"$PROGNAME" at "`date`|tee $LOG #---------------------------Precondition------------------------------------------ # check the Postgres -ps -e | grep --quiet postmaster +ps -e | grep --quiet -w postgres if [ $? -ne 0 ] then - echo no postmaster available|tee -a $LOG - exit $CODE_FAIL + echo no postgres available|tee -a $LOG + exit $CODE_FAIL fi # check the Rasdaman @@ -391,7 +391,7 @@ rm mr_1.hdf.unknown if [ $NUM_TOTAL = $NUM_SUC ] then - exit $CODE_OK 0 + exit $CODE_OK else - exit $CODE_FAIL 255 - fi
\ No newline at end of file + exit $CODE_FAIL + fi diff --git a/systemtest/testcases_mandatory/test_manipulation/test.sh b/systemtest/testcases_mandatory/test_manipulation/test.sh index 63e778a..47d70aa 100755 --- a/systemtest/testcases_mandatory/test_manipulation/test.sh +++ b/systemtest/testcases_mandatory/test_manipulation/test.sh @@ -78,11 +78,11 @@ echo "Test by:"$PROGNAME" at "`date`|tee $LOG #---------------------------Precondition------------------------------------------ # check the Postgres -ps -e | grep --quiet postmaster +ps -e | grep --quiet -w postgres if [ $? -ne 0 ] then - echo no postmaster available|tee -a $LOG - exit $CODE_FAIL + echo no postgres available|tee -a $LOG + exit $CODE_FAIL fi # check the Rasdaman @@ -186,7 +186,7 @@ NUM_TOTAL=$(($NUM_SUC + $NUM_FAIL)) if [ $NUM_TOTAL = $NUM_SUC ] then - exit $CODE_OK 0 + exit $CODE_OK else - exit $CODE_FAIL 255 + exit $CODE_FAIL fi diff --git a/systemtest/testcases_mandatory/test_select/test.sh b/systemtest/testcases_mandatory/test_select/test.sh index 70dfc1f..3b17ee1 100755 --- a/systemtest/testcases_mandatory/test_select/test.sh +++ b/systemtest/testcases_mandatory/test_select/test.sh @@ -83,11 +83,11 @@ 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 - exit $CODE_FAIL + echo no postgres available|tee -a $LOG + exit $CODE_FAIL fi # check the Rasdaman @@ -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 @@ -286,7 +286,7 @@ fi if [ $NUM_TOTAL = $NUM_SUC ] then - exit $CODE_OK 0 + exit $CODE_OK else - exit $CODE_FAIL 255 + exit $CODE_FAIL fi diff --git a/systemtest/testcases_mandatory/test_select/test_rasql/induced_and_struct.rasql b/systemtest/testcases_mandatory/test_select/test_rasql/induced_and_struct.rasql index 67d8273..9a0486b 100644 --- a/systemtest/testcases_mandatory/test_select/test_rasql/induced_and_struct.rasql +++ b/systemtest/testcases_mandatory/test_select/test_rasql/induced_and_struct.rasql @@ -1 +1 @@ -select test_rgb + 5 from test_rgb
\ No newline at end of file +select test_rgb2 + 5 from test_rgb2 |