Changeset: d5657f9051dc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d5657f9051dc
Modified Files:
sql/test/mapi/Tests/perl_dbi.SQL.sh
sql/test/mapi/Tests/php_monetdb.SQL.sh
sql/test/mapi/Tests/python_dbapi.SQL.bat
sql/test/mapi/Tests/python_dbapi.SQL.sh
sql/test/mapi/Tests/python_test_monetdb_sql.SQL.bat
sql/test/mapi/Tests/python_test_monetdb_sql.SQL.sh
sql/test/mapi/Tests/sample0.SQL.bat
sql/test/mapi/Tests/sample0.SQL.sh
sql/test/mapi/Tests/sample1.SQL.bat
sql/test/mapi/Tests/sample1.SQL.sh
sql/test/mapi/Tests/sample2.SQL.bat
sql/test/mapi/Tests/sample2.SQL.sh
sql/test/mapi/Tests/sample3.SQL.bat
sql/test/mapi/Tests/sample3.SQL.sh
sql/test/mapi/Tests/sample4.SQL.bat
sql/test/mapi/Tests/sample4.SQL.sh
sql/test/mapi/Tests/smack00.SQL.bat
sql/test/mapi/Tests/smack00.SQL.sh
sql/test/mapi/Tests/smack01.SQL.bat
sql/test/mapi/Tests/smack01.SQL.sh
Branch: default
Log Message:
tests: more voodoo to get things running again
diffs (237 lines):
diff --git a/sql/test/mapi/Tests/perl_dbi.SQL.sh
b/sql/test/mapi/Tests/perl_dbi.SQL.sh
--- a/sql/test/mapi/Tests/perl_dbi.SQL.sh
+++ b/sql/test/mapi/Tests/perl_dbi.SQL.sh
@@ -1,9 +1,14 @@
#!/bin/sh
-PATH="`monetdb-clients-config --pkglibdir`/Tests:$PATH"
-export PATH
+eval "`perl -V:installvendorarch`"
+eval "`perl -V:installprefix`"
+inspfxlen=`echo $installprefix | wc -c`
-PERLLIB="`monetdb-clients-config --perllibdir`"
+prefix="`type -P sqlsample.pl`"
+prefix="`dirname $prefix`"
+prefix="`dirname $prefix`"
+
+PERLLIB="$prefix`echo $installvendorarch | cut -c${inspfxlen}-`"
export PERLLIB
Mlog -x "sqlsample.pl $MAPIPORT $TSTDB"
diff --git a/sql/test/mapi/Tests/php_monetdb.SQL.sh
b/sql/test/mapi/Tests/php_monetdb.SQL.sh
--- a/sql/test/mapi/Tests/php_monetdb.SQL.sh
+++ b/sql/test/mapi/Tests/php_monetdb.SQL.sh
@@ -1,6 +1,8 @@
#!/bin/sh
-path="`monetdb-clients-config --pkglibdir`/Tests"
-dir="`monetdb-clients-config --datadir`/php"
+path="`type -P sqlsample.php`"
+dir="`dirname $path`"
+dir="`dirname $dir`"
+dir="$dir/share/php"
-Mlog -x "php -n -d include_path=$dir -f $path/sqlsample.php $MAPIPORT $TSTDB"
+Mlog -x "php -n -d include_path=$dir -f $path $MAPIPORT $TSTDB"
diff --git a/sql/test/mapi/Tests/python_dbapi.SQL.bat
b/sql/test/mapi/Tests/python_dbapi.SQL.bat
--- a/sql/test/mapi/Tests/python_dbapi.SQL.bat
+++ b/sql/test/mapi/Tests/python_dbapi.SQL.bat
@@ -1,9 +1,5 @@
@echo off
-set PATH=%PREFIX%\lib\MonetDB\Tests;%PATH%
-
-set
PYTHONPATH=%PREFIX%\%PYTHON_LIBDIR%;%PREFIX%\%PYTHON_LIBDIR%\MonetDB;%PYTHONPATH%
-
prompt # $t $g
echo on
diff --git a/sql/test/mapi/Tests/python_dbapi.SQL.sh
b/sql/test/mapi/Tests/python_dbapi.SQL.sh
--- a/sql/test/mapi/Tests/python_dbapi.SQL.sh
+++ b/sql/test/mapi/Tests/python_dbapi.SQL.sh
@@ -1,9 +1,3 @@
#!/bin/sh
-PATH="`monetdb-clients-config --pkglibdir`/Tests:$PATH"
-export PATH
-
-PYTHONPATH="`monetdb-config --pythonlibdir`:`monetdb-clients-config
--pythonlibdir`:`monetdb-clients-config --pythonlibdir`/MonetDB:$PYTHONPATH"
-export PYTHONPATH
-
Mlog -x "sqlsample.py $MAPIPORT $TSTDB"
diff --git a/sql/test/mapi/Tests/python_test_monetdb_sql.SQL.bat
b/sql/test/mapi/Tests/python_test_monetdb_sql.SQL.bat
--- a/sql/test/mapi/Tests/python_test_monetdb_sql.SQL.bat
+++ b/sql/test/mapi/Tests/python_test_monetdb_sql.SQL.bat
@@ -3,8 +3,8 @@
call monetdb-clients-config --internal
rem must be aligned with the installation directory chosen in
-rem clients/src/python/test/Makefile.ag
-set testpath=%TSTSRCBASE%\..\python\test
+rem clients/python/test/Makefile.ag
+set testpath=%TSTSRCBASE%\..\clients\python\test
set PYTHONPATH=%testpath%;%PYTHONPATH%
prompt # $t $g
diff --git a/sql/test/mapi/Tests/python_test_monetdb_sql.SQL.sh
b/sql/test/mapi/Tests/python_test_monetdb_sql.SQL.sh
--- a/sql/test/mapi/Tests/python_test_monetdb_sql.SQL.sh
+++ b/sql/test/mapi/Tests/python_test_monetdb_sql.SQL.sh
@@ -1,8 +1,8 @@
#!/bin/sh
# must be aligned with the installation directory chosen in
-# clients/src/python/test/Makefile.ag
-testpath="$TSTSRCBASE/../python/test"
+# clients/python/test/Makefile.ag
+testpath="$TSTSRCBASE/../clients/python/test"
PYTHONPATH=$testpath:$PYTHONPATH
export PYTHONPATH
diff --git a/sql/test/mapi/Tests/sample0.SQL.bat
b/sql/test/mapi/Tests/sample0.SQL.bat
--- a/sql/test/mapi/Tests/sample0.SQL.bat
+++ b/sql/test/mapi/Tests/sample0.SQL.bat
@@ -1,7 +1,5 @@
@echo off
-set PATH=%CLIENTS_PREFIX%\lib\MonetDB\Tests;%PATH%
-
prompt # $t $g
echo on
diff --git a/sql/test/mapi/Tests/sample0.SQL.sh
b/sql/test/mapi/Tests/sample0.SQL.sh
--- a/sql/test/mapi/Tests/sample0.SQL.sh
+++ b/sql/test/mapi/Tests/sample0.SQL.sh
@@ -1,6 +1,3 @@
#!/bin/sh
-PATH="`monetdb-clients-config --pkglibdir`/Tests:$PATH"
-export PATH
-
Mlog -x "sample0 $HOST $MAPIPORT sql"
diff --git a/sql/test/mapi/Tests/sample1.SQL.bat
b/sql/test/mapi/Tests/sample1.SQL.bat
--- a/sql/test/mapi/Tests/sample1.SQL.bat
+++ b/sql/test/mapi/Tests/sample1.SQL.bat
@@ -1,7 +1,5 @@
@echo off
-set PATH=%CLIENTS_PREFIX%\lib\MonetDB\Tests;%PATH%
-
prompt # $t $g
echo on
diff --git a/sql/test/mapi/Tests/sample1.SQL.sh
b/sql/test/mapi/Tests/sample1.SQL.sh
--- a/sql/test/mapi/Tests/sample1.SQL.sh
+++ b/sql/test/mapi/Tests/sample1.SQL.sh
@@ -1,6 +1,3 @@
#!/bin/sh
-PATH="`monetdb-clients-config --pkglibdir`/Tests:$PATH"
-export PATH
-
Mlog -x "sample1 $HOST $MAPIPORT sql"
diff --git a/sql/test/mapi/Tests/sample2.SQL.bat
b/sql/test/mapi/Tests/sample2.SQL.bat
--- a/sql/test/mapi/Tests/sample2.SQL.bat
+++ b/sql/test/mapi/Tests/sample2.SQL.bat
@@ -1,7 +1,5 @@
@echo off
-set PATH=%CLIENTS_PREFIX%\lib\MonetDB\Tests;%PATH%
-
prompt # $t $g
echo on
diff --git a/sql/test/mapi/Tests/sample2.SQL.sh
b/sql/test/mapi/Tests/sample2.SQL.sh
--- a/sql/test/mapi/Tests/sample2.SQL.sh
+++ b/sql/test/mapi/Tests/sample2.SQL.sh
@@ -1,6 +1,3 @@
#!/bin/sh
-PATH="`monetdb-clients-config --pkglibdir`/Tests:$PATH"
-export PATH
-
Mlog -x "sample2 $HOST $MAPIPORT sql"
diff --git a/sql/test/mapi/Tests/sample3.SQL.bat
b/sql/test/mapi/Tests/sample3.SQL.bat
--- a/sql/test/mapi/Tests/sample3.SQL.bat
+++ b/sql/test/mapi/Tests/sample3.SQL.bat
@@ -1,7 +1,5 @@
@echo off
-set PATH=%CLIENTS_PREFIX%\lib\MonetDB\Tests;%PATH%
-
prompt # $t $g
echo on
diff --git a/sql/test/mapi/Tests/sample3.SQL.sh
b/sql/test/mapi/Tests/sample3.SQL.sh
--- a/sql/test/mapi/Tests/sample3.SQL.sh
+++ b/sql/test/mapi/Tests/sample3.SQL.sh
@@ -1,6 +1,3 @@
#!/bin/sh
-PATH="`monetdb-clients-config --pkglibdir`/Tests:$PATH"
-export PATH
-
Mlog -x "sample3 $HOST $MAPIPORT sql"
diff --git a/sql/test/mapi/Tests/sample4.SQL.bat
b/sql/test/mapi/Tests/sample4.SQL.bat
--- a/sql/test/mapi/Tests/sample4.SQL.bat
+++ b/sql/test/mapi/Tests/sample4.SQL.bat
@@ -1,7 +1,5 @@
@echo off
-set PATH=%CLIENTS_PREFIX%\lib\MonetDB\Tests;%PATH%
-
prompt # $t $g
echo on
diff --git a/sql/test/mapi/Tests/sample4.SQL.sh
b/sql/test/mapi/Tests/sample4.SQL.sh
--- a/sql/test/mapi/Tests/sample4.SQL.sh
+++ b/sql/test/mapi/Tests/sample4.SQL.sh
@@ -1,6 +1,3 @@
#!/bin/sh
-PATH="`monetdb-clients-config --pkglibdir`/Tests:$PATH"
-export PATH
-
Mlog -x "sample4 $HOST $MAPIPORT sql"
diff --git a/sql/test/mapi/Tests/smack00.SQL.bat
b/sql/test/mapi/Tests/smack00.SQL.bat
--- a/sql/test/mapi/Tests/smack00.SQL.bat
+++ b/sql/test/mapi/Tests/smack00.SQL.bat
@@ -1,7 +1,5 @@
@echo off
-set PATH=%CLIENTS_PREFIX%\lib\MonetDB\Tests;%PATH%
-
prompt # $t $g
echo on
diff --git a/sql/test/mapi/Tests/smack00.SQL.sh
b/sql/test/mapi/Tests/smack00.SQL.sh
--- a/sql/test/mapi/Tests/smack00.SQL.sh
+++ b/sql/test/mapi/Tests/smack00.SQL.sh
@@ -1,6 +1,3 @@
#!/bin/sh
-PATH="`monetdb-clients-config --pkglibdir`/Tests:$PATH"
-export PATH
-
Mlog -x "smack00 $MAPIPORT sql"
diff --git a/sql/test/mapi/Tests/smack01.SQL.bat
b/sql/test/mapi/Tests/smack01.SQL.bat
--- a/sql/test/mapi/Tests/smack01.SQL.bat
+++ b/sql/test/mapi/Tests/smack01.SQL.bat
@@ -1,7 +1,5 @@
@echo off
-set PATH=%CLIENTS_PREFIX%\lib\MonetDB\Tests;%PATH%
-
prompt # $t $g
echo on
diff --git a/sql/test/mapi/Tests/smack01.SQL.sh
b/sql/test/mapi/Tests/smack01.SQL.sh
--- a/sql/test/mapi/Tests/smack01.SQL.sh
+++ b/sql/test/mapi/Tests/smack01.SQL.sh
@@ -1,6 +1,3 @@
#!/bin/sh
-PATH="`monetdb-clients-config --pkglibdir`/Tests:$PATH"
-export PATH
-
Mlog -x smack01 $MAPIPORT sql
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
