You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by ar...@apache.org on 2016/03/08 08:13:21 UTC
[2/3] incubator-trafodion git commit: Cleanup of runregr_udr.sh as
suggested by Anu.
Cleanup of runregr_udr.sh as suggested by Anu.
Anu found that we used an old name for the T4 JDBC driver that
should be cleaned up, also removed some related dead code.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a1984203
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a1984203
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a1984203
Branch: refs/heads/master
Commit: a1984203a9f6cec97879854d91ecbc6d30979c80
Parents: ea88ae5
Author: Hans Zeller <hz...@apache.org>
Authored: Mon Mar 7 19:50:14 2016 +0000
Committer: Hans Zeller <hz...@apache.org>
Committed: Mon Mar 7 19:50:14 2016 +0000
----------------------------------------------------------------------
core/sql/regress/tools/runregr_udr.ksh | 61 +----------------------------
1 file changed, 2 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a1984203/core/sql/regress/tools/runregr_udr.ksh
----------------------------------------------------------------------
diff --git a/core/sql/regress/tools/runregr_udr.ksh b/core/sql/regress/tools/runregr_udr.ksh
index 63b47a5..9e05d2b 100755
--- a/core/sql/regress/tools/runregr_udr.ksh
+++ b/core/sql/regress/tools/runregr_udr.ksh
@@ -53,22 +53,6 @@ if [ $NSK -eq 1 -o $LINUX -eq 1 ]; then
USE_NDCS=1
fi
-#
-# getJavaCompFuncs contains functions to display vprocs for Java
-# components on NSK only. Here we simply load the shell functions that
-# do the work. The functions will be called later.
-#
-typeset -i DISPLAY_NSK_JAVA_COMPS=0
-if [ $NSK -ne 0 -a "$SKIP_JAVA_CHECKS" != "" ]; then
- if [ -s $scriptsdir/tools/getJavaCompFuncs ]; then
- . $scriptsdir/tools/getJavaCompFuncs
- DISPLAY_NSK_JAVA_COMPS=1
- else
- echo "\n*** WARNING: Unable to locate $scriptsdir/tools/getJavaCompFuncs"
- echo "*** Continuing"
- fi
-fi
-
function USAGE
{
cat <<EOF
@@ -183,25 +167,8 @@ function PRINT_SKIP_FILES
function PRINT_JAVA_COMPONENTS
{
- if [ $DISPLAY_NSK_JAVA_COMPS -eq 1 ]; then
-
- HEADER "Java components"
-
- getJdbcMxJarComp v
- getJavaComp T0083 v
- getJavaComp T1225 v
- getLMComp v
- getMxServerComp MXUDR T0083 v
- getMxServerComp MXUDR T1225 v
- getMxServerComp MXUDR T1231 v
-
- testJdbcInJavaAndUdrServer
- testJdbcAndUdrServer
- testJavaAndUdrServer
- testJdbcInJarAndJava
- testLMInJarAndUdrServer
-
- fi
+ # empty for now
+ true
}
# TESTS that make a JDBC Connection. These tests need ODBC assoc server
@@ -366,8 +333,6 @@ typeset TESTFILES="$*"
TESTFILES=`echo $TESTFILES | tr a-z A-Z`
if [ "$TESTFILES" = "" ]; then
TESTFILES="TEST???"
-else
- DISPLAY_NSK_JAVA_COMPS=0
fi
PRETTY_FILES "$TESTFILES"
TESTFILES="$PFILES"
@@ -759,12 +724,6 @@ function DO_TEST
fi
fi
- # On NSK and LINUX, set CLASSPATH. If tests use a JDBC application,
- # CLASSPATH should have JDBC jar.
- if [ $NSK -ne 0 ]; then
- export CLASSPATH=$SQLMX_JAVA_EXTENSIONS:$CLASSPATH:.
- fi
-
# create a tempfile which is used as timestamp for deleting
# saveabend files after the test completes
touch TimestampFile
@@ -834,22 +793,6 @@ echo "schema=$TEST_SCHEMA" >schema.prop
echo "$(date '+%m/%d/%Y %R')" >> $rgrlog
-# Following export is to workaround an MXCI problem where
-# mxci crashes when a command such as set envvar X '$x:abc' used and
-# x is not defined.
-#
-# _RLD_LIB_PATH is not used on MIPS and 'set envvar' crashes mxci. Right now
-# there is no way to differentiate between MIPS and YOS from mxci prompt.
-# So we are adding this workaround in this shell script.
-#
-if [ $NSK -ne 0 -a `uname -r` != H06 ]; then
- export _RLD_LIB_PATH=/G/system/system
-fi
-
-if [ $LINUX -ne 0 ]; then
- export CLASSPATH=$MY_SQROOT/export/lib/hpt4jdbc.jar:$CLASSPATH:.
-fi
-
export JDBC_T4_URL="jdbc:t4jdbc://localhost:23400/:"
if [ -r $MY_SQROOT/sql/scripts/sw_env.sh ]; then
# use a custom port for the JDBC Type 4 driver