Changeset: 9c46e92fdffd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9c46e92fdffd
Added Files:
sql/test/mapi/Tests/python3_dec38.SQL.py
sql/test/mapi/Tests/python3_int128.SQL.py
Removed Files:
sql/test/mapi/Tests/python3_dec38.SQL.bat
sql/test/mapi/Tests/python3_dec38.SQL.sh
sql/test/mapi/Tests/python3_int128.SQL.bat
sql/test/mapi/Tests/python3_int128.SQL.sh
sql/test/mapi/Tests/python_dec38.py
sql/test/mapi/Tests/python_int128.py
Branch: Dec2023
Log Message:
No need for extra scripts, use Python directly.
diffs (87 lines):
diff --git a/sql/test/mapi/Tests/python3_dec38.SQL.bat
b/sql/test/mapi/Tests/python3_dec38.SQL.bat
deleted file mode 100755
--- a/sql/test/mapi/Tests/python3_dec38.SQL.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-@echo off
-
-rem must be aligned with the installation directory chosen in
-rem clients/python/test/Makefile.ag
-set testpath=%TSTSRCDIR%
-
-prompt # $t $g
-
-"%PYTHON%" "%testpath%/python_dec38.py %MAPIPORT% %TSTDB% %MAPIHOST%"
diff --git a/sql/test/mapi/Tests/python_dec38.py
b/sql/test/mapi/Tests/python3_dec38.SQL.py
rename from sql/test/mapi/Tests/python_dec38.py
rename to sql/test/mapi/Tests/python3_dec38.SQL.py
--- a/sql/test/mapi/Tests/python_dec38.py
+++ b/sql/test/mapi/Tests/python3_dec38.SQL.py
@@ -11,10 +11,10 @@
# Copyright 1997 - July 2008 CWI.
import pymonetdb
-import sys
+import sys, os
from decimal import Decimal
-dbh =
pymonetdb.connect(port=int(sys.argv[1]),database=sys.argv[2],hostname=sys.argv[3],autocommit=True)
+dbh =
pymonetdb.connect(port=int(os.getenv('MAPIPORT')),database=os.getenv('TSTDB'),hostname=os.getenv('MAPIHOST'),autocommit=True)
cursor = dbh.cursor()
diff --git a/sql/test/mapi/Tests/python3_dec38.SQL.sh
b/sql/test/mapi/Tests/python3_dec38.SQL.sh
deleted file mode 100755
--- a/sql/test/mapi/Tests/python3_dec38.SQL.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# must be aligned with the installation directory chosen in
-# clients/python/test/Makefile.ag
-testpath="$TSTSRCDIR"
-
-${PYTHON} $testpath/python_dec38.py $MAPIPORT $TSTDB $MAPIHOST
diff --git a/sql/test/mapi/Tests/python3_int128.SQL.bat
b/sql/test/mapi/Tests/python3_int128.SQL.bat
deleted file mode 100755
--- a/sql/test/mapi/Tests/python3_int128.SQL.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-@echo off
-
-rem must be aligned with the installation directory chosen in
-rem clients/python/test/Makefile.ag
-set testpath=%TSTSRCDIR%
-
-prompt # $t $g
-
-"%PYTHON%" "%testpath%/python_int128.py %MAPIPORT% %TSTDB% %MAPIHOST%"
diff --git a/sql/test/mapi/Tests/python_int128.py
b/sql/test/mapi/Tests/python3_int128.SQL.py
rename from sql/test/mapi/Tests/python_int128.py
rename to sql/test/mapi/Tests/python3_int128.SQL.py
--- a/sql/test/mapi/Tests/python_int128.py
+++ b/sql/test/mapi/Tests/python3_int128.SQL.py
@@ -11,9 +11,9 @@
# Copyright 1997 - July 2008 CWI.
import pymonetdb
-import sys
+import sys, os
-dbh =
pymonetdb.connect(port=int(sys.argv[1]),database=sys.argv[2],hostname=sys.argv[3],autocommit=True)
+dbh =
pymonetdb.connect(port=int(os.getenv('MAPIPORT')),database=os.getenv('TSTDB'),hostname=os.getenv('MAPIHOST'),autocommit=True)
cursor = dbh.cursor()
diff --git a/sql/test/mapi/Tests/python3_int128.SQL.sh
b/sql/test/mapi/Tests/python3_int128.SQL.sh
deleted file mode 100755
--- a/sql/test/mapi/Tests/python3_int128.SQL.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# must be aligned with the installation directory chosen in
-# clients/python/test/Makefile.ag
-testpath="$TSTSRCDIR"
-
-${PYTHON} $testpath/python_int128.py $MAPIPORT $TSTDB $MAPIHOST
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
