From 6b02a9db35eb698105d725983d7e2ae35ec437ec Mon Sep 17 00:00:00 2001
From: kishoramballi <kishoramballi>
Date: Thu, 30 Apr 2009 06:32:11 +0000
Subject: [PATCH] Statement fixed as history implementation was affecting.
 SQLServer is made to run along with csql server during testing.
 dbapi/conn/test002.ksh fixed

---
 test/dbapi/Connection/test002.ksh | 2 +-
 test/execTests.ksh                | 7 +++++--
 test/jdbc/Statement/test013.ksh   | 7 +++++--
 test/jdbc/Statement/test014.ksh   | 6 +++++-
 test/jdbc/Statement/test019.ksh   | 6 +++++-
 test/jdbc/Statement/test020.ksh   | 7 +++++--
 test/jdbc/Statement/test021.ksh   | 7 +++++--
 7 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/test/dbapi/Connection/test002.ksh b/test/dbapi/Connection/test002.ksh
index 4dc69756..77165926 100755
--- a/test/dbapi/Connection/test002.ksh
+++ b/test/dbapi/Connection/test002.ksh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # TestCase:
 
-CSQL_CONFIG_FILE=$CSQL_SRCROOT/test/csql.conf
+CSQL_CONFIG_FILE=
 
 
 
diff --git a/test/execTests.ksh b/test/execTests.ksh
index fd07885c..a5838b1d 100755
--- a/test/execTests.ksh
+++ b/test/execTests.ksh
@@ -42,6 +42,8 @@ ROOT_DIR=`pwd`
 mkdir -p $TEST_RUN_ROOT
 SERVOUT=$TEST_RUN_ROOT/serv.out
 touch $SERVOUT
+
+export CSQL_CONFIG_FILE=csql.conf
 $CSQL_INSTALL_ROOT/bin/csqlserver >${SERVOUT} &
 SERVER_PID=$!
 echo "Starting Server"
@@ -55,7 +57,7 @@ do
     fi
     echo "MODULE READ is $MODULE"
 
-if [ "$MODULE" = "system/lock" ]
+if [ "$MODULE" = "system/lock" -o "$MODULE" = "system/Allocator" ]
 then
    echo "Restarting the server for lock module"
    kill -9 ${SERVER_PID}
@@ -68,6 +70,7 @@ then
    echo "Restarting Server"
    sleep 5
 fi
+
 TEST_SCRIPT_DIR=${ROOT_DIR}/${MODULE}
 TEST_RUN_DIR=${TEST_RUN_ROOT}/${MODULE}
 if [ -s "$TEST_RUN_DIR" ]
@@ -215,7 +218,7 @@ fi
 
 done
 done < TestModules
-
+kill `ps -e | grep csqlsqlserver | gawk -F" " '{ print $1 }'`
 kill -9 ${SERVER_PID}
 ipcrm -M 2222 -M 3333 
 echo "csqlserver killed PID=${SERVER_PID}" >>${TEST_LOG}
diff --git a/test/jdbc/Statement/test013.ksh b/test/jdbc/Statement/test013.ksh
index a7778e5f..dd0c64c8 100755
--- a/test/jdbc/Statement/test013.ksh
+++ b/test/jdbc/Statement/test013.ksh
@@ -8,12 +8,15 @@ if [ -s "$TESTFILE" ]
 then
     REL_PATH=`pwd`/jdbc/Statement
 fi
+echo "Drop table T1;" > ${REL_PATH}/tmp.sql
 export CLASSPATH=$CLASSPATH:${REL_PATH}
 java TestScript4
 if [ $? -ne 0 ]
 then
-   echo "Drop table T1;"| $CSQL_INSTALL_ROOT/bin/csql
+   $CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/tmp.sql
+   rm -f ${REL_PATH}/tmp.sql
    exit 1;
 fi
-echo "Drop table T1;"| $CSQL_INSTALL_ROOT/bin/csql
+$CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/tmp.sql
+rm -f ${REL_PATH}/tmp.sql
 exit 0;
diff --git a/test/jdbc/Statement/test014.ksh b/test/jdbc/Statement/test014.ksh
index 513453f9..6c02d277 100755
--- a/test/jdbc/Statement/test014.ksh
+++ b/test/jdbc/Statement/test014.ksh
@@ -8,11 +8,15 @@ if [ -s "$TESTFILE" ]
 then
     REL_PATH=`pwd`/jdbc/Statement
 fi
+echo "Drop table T1;" > ${REL_PATH}/tmp.sql
 export CLASSPATH=$CLASSPATH:${REL_PATH}
 java TestScript5
 if [ $? -ne 0 ]
 then
-   echo "Drop table T1;"| $CSQL_INSTALL_ROOT/bin/csql
+$CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/tmp.sql
+rm -f ${REL_PATH}/tmp.sql
    exit 1;
 fi
+$CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/tmp.sql
+rm -f ${REL_PATH}/tmp.sql
 exit 0;
diff --git a/test/jdbc/Statement/test019.ksh b/test/jdbc/Statement/test019.ksh
index 35d1e27b..ba4b2483 100755
--- a/test/jdbc/Statement/test019.ksh
+++ b/test/jdbc/Statement/test019.ksh
@@ -8,11 +8,15 @@ if [ -s "$TESTFILE" ]
 then
     REL_PATH=`pwd`/jdbc/Statement
 fi
+echo "Drop table T1;" > ${REL_PATH}/tmp.sql 
 export CLASSPATH=$CLASSPATH:${REL_PATH}
 java TestScript10
 if [ $? -ne 0 ]
 then
-   echo "Drop table T1;"| $CSQL_INSTALL_ROOT/bin/csql 
+$CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/tmp.sql
+rm -f ${REL_PATH}/tmp.sql
    exit 1;
 fi
+$CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/tmp.sql
+rm -f ${REL_PATH}/tmp.sql
 exit 0;
diff --git a/test/jdbc/Statement/test020.ksh b/test/jdbc/Statement/test020.ksh
index 7eb56e51..7935a5f2 100755
--- a/test/jdbc/Statement/test020.ksh
+++ b/test/jdbc/Statement/test020.ksh
@@ -8,12 +8,15 @@ if [ -s "$TESTFILE" ]
 then
     REL_PATH=`pwd`/jdbc/Statement
 fi
+echo "Drop table T1;" > ${REL_PATH}/tmp.sql
 export CLASSPATH=$CLASSPATH:${REL_PATH}
 java TestScript11
 if [ $? -ne 0 ]
 then
-   echo "Drop table T1;"| $CSQL_INSTALL_ROOT/bin/csql 
+   $CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/tmp.sql
+   rm -f ${REL_PATH}/tmp.sql
    exit 1;
 fi
-echo "Drop table T1;"| $CSQL_INSTALL_ROOT/bin/csql
+$CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/tmp.sql
+rm -f ${REL_PATH}/tmp.sql
 exit 0;
diff --git a/test/jdbc/Statement/test021.ksh b/test/jdbc/Statement/test021.ksh
index f52a4561..2a359156 100755
--- a/test/jdbc/Statement/test021.ksh
+++ b/test/jdbc/Statement/test021.ksh
@@ -8,12 +8,15 @@ if [ -s "$TESTFILE" ]
 then
     REL_PATH=`pwd`/jdbc/Statement
 fi
+echo "Drop table T1;" > ${REL_PATH}/tmp.sql
 export CLASSPATH=$CLASSPATH:${REL_PATH}
 java TestScript12
 if [ $? -ne 0 ]
 then
-   echo "Drop table T1;"| $CSQL_INSTALL_ROOT/bin/csql 
+   $CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/tmp.sql
+   rm -f ${REL_PATH}/tmp.sql
    exit 1;
 fi
-echo "Drop table T1;"| $CSQL_INSTALL_ROOT/bin/csql
+$CSQL_INSTALL_ROOT/bin/csql -s ${REL_PATH}/tmp.sql
+rm -f ${REL_PATH}/tmp.sql
 exit 0;
-- 
2.11.4.GIT