MonetDB: Jul2015 - Double all backslashes in path name that ends...

[Sjoerd Mullender]

Changeset: 7766a2274ca7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7766a2274ca7
Modified Files:
        sql/benchmarks/ssbm/Tests/load.SQL.py
        sql/benchmarks/tpch/LOCKED/Tests/load.SQL.py
        sql/benchmarks/tpch/Tests/load.SQL.py
        sql/benchmarks/tpch/fileleak/Tests/load.SQL.py
Branch: Jul2015
Log Message:

Double all backslashes in path name that ends up in SQL command.


diffs (48 lines):

diff --git a/sql/benchmarks/ssbm/Tests/load.SQL.py 
b/sql/benchmarks/ssbm/Tests/load.SQL.py
--- a/sql/benchmarks/ssbm/Tests/load.SQL.py
+++ b/sql/benchmarks/ssbm/Tests/load.SQL.py
@@ -5,7 +5,7 @@ except ImportError:
     import process
 
 TSTSRCDIR = os.environ['TSTSRCDIR']
-DATADIR = os.path.join(TSTSRCDIR,"SF-0.01") + os.sep.replace('\\', r'\\')
+DATADIR = (os.path.join(TSTSRCDIR,"SF-0.01") + os.sep).replace('\\', r'\\')
 
 c = process.client('sql', stdin = process.PIPE, stdout = process.PIPE, stderr 
= process.PIPE)
 for ln in open(os.path.join(TSTSRCDIR,"load-sf-0.01.sql")):
diff --git a/sql/benchmarks/tpch/LOCKED/Tests/load.SQL.py 
b/sql/benchmarks/tpch/LOCKED/Tests/load.SQL.py
--- a/sql/benchmarks/tpch/LOCKED/Tests/load.SQL.py
+++ b/sql/benchmarks/tpch/LOCKED/Tests/load.SQL.py
@@ -7,7 +7,7 @@ except ImportError:
 TSTSRCBASE = os.environ['TSTSRCBASE']
 TSTDIR = os.environ['TSTDIR']
 SRCDIR = os.path.join(TSTSRCBASE,TSTDIR,os.pardir)
-DATADIR = os.path.join(SRCDIR,"SF-0.01") + os.sep.replace('\\', r'\\')
+DATADIR = (os.path.join(SRCDIR,"SF-0.01") + os.sep).replace('\\', r'\\')
 
 c = process.client('sql', stdin = process.PIPE, stdout = process.PIPE, stderr 
= process.PIPE)
 for ln in open(os.path.join(SRCDIR,"load-sf-0.01-LOCKED.sql")):
diff --git a/sql/benchmarks/tpch/Tests/load.SQL.py 
b/sql/benchmarks/tpch/Tests/load.SQL.py
--- a/sql/benchmarks/tpch/Tests/load.SQL.py
+++ b/sql/benchmarks/tpch/Tests/load.SQL.py
@@ -7,7 +7,7 @@ except ImportError:
 TSTSRCBASE = os.environ['TSTSRCBASE']
 TSTDIR = os.environ['TSTDIR']
 SRCDIR = os.path.join(TSTSRCBASE,TSTDIR)
-DATADIR = os.path.join(SRCDIR,"SF-0.01") + os.sep.replace('\\', r'\\')
+DATADIR = (os.path.join(SRCDIR,"SF-0.01") + os.sep).replace('\\', r'\\')
 
 c = process.client('sql', stdin = process.PIPE, stdout = process.PIPE, stderr 
= process.PIPE)
 for ln in open(os.path.join(SRCDIR,"load-sf-0.01.sql")):
diff --git a/sql/benchmarks/tpch/fileleak/Tests/load.SQL.py 
b/sql/benchmarks/tpch/fileleak/Tests/load.SQL.py
--- a/sql/benchmarks/tpch/fileleak/Tests/load.SQL.py
+++ b/sql/benchmarks/tpch/fileleak/Tests/load.SQL.py
@@ -7,7 +7,7 @@ except ImportError:
 TSTSRCBASE = os.environ['TSTSRCBASE']
 TSTDIR = os.environ['TSTDIR']
 SRCDIR = os.path.join(TSTSRCBASE,TSTDIR,os.pardir)
-DATADIR = os.path.join(SRCDIR,"SF-0.01") + os.sep.replace('\\', r'\\')
+DATADIR = (os.path.join(SRCDIR,"SF-0.01") + os.sep).replace('\\', r'\\')
 
 c = process.client('sql', stdin = process.PIPE, stdout = process.PIPE, stderr 
= process.PIPE)
 for ln in open(os.path.join(SRCDIR,"load-sf-0.01-LOCKED.sql")):
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list