Changeset: 7d370c891e9e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7d370c891e9e
Branch: userprofile
Log Message:
merge with default
diffs (50 lines):
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.py
b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.py
--- a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.py
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.py
@@ -69,6 +69,11 @@ if len(sys.argv) == 2 and sys.argv[1] ==
if found:
break
stable = open(f).readlines()
+ if not os.getenv('HAVE_SHP'):
+ for i in range(len(stable)):
+ if 'SHPattach' in stable[i]:
+ del stable[i-1:i+5]
+ break
import difflib
for line in difflib.unified_diff(stable, srvout, fromfile='test',
tofile=f):
sys.stderr.write(line)
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.py
b/sql/test/testdb-upgrade-chain/Tests/upgrade.py
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.py
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.py
@@ -69,6 +69,11 @@ if len(sys.argv) == 2 and sys.argv[1] ==
if found:
break
stable = open(f).readlines()
+ if not os.getenv('HAVE_SHP'):
+ for i in range(len(stable)):
+ if 'SHPattach' in stable[i]:
+ del stable[i-1:i+5]
+ break
import difflib
for line in difflib.unified_diff(stable, srvout, fromfile='test',
tofile=f):
sys.stderr.write(line)
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1290,6 +1290,7 @@ def PerformDir(env, testdir, testlist, t
os.environ['TSTTRGDIR'] = TSTTRGDIR
os.environ['RELSRCDIR'] = env['RELSRCDIR']
os.environ['HAVE_HGE'] = CONDITIONALS['HAVE_HGE']
+ os.environ['HAVE_SHP'] = CONDITIONALS['HAVE_SHP']
os.environ['TST_BITS'] = env['TST_BITS']
if 'TSTDATAPATH' not in os.environ and TSTDATAPATH:
env['TSTDATAPATH'] = TSTDATAPATH
@@ -1764,7 +1765,7 @@ def GetBitsAndModsAndThreads(env) :
if not env['TST_BITS'] or not env['TST_MODS']:
print(' '.join(cmd) + "\n\n", file=sys.stderr, end='')
print(qOut, file=sys.stderr, end='')
- print.write(file=sys.stderr)
+ print(file=sys.stderr)
print(qErr, file=sys.stderr, flush=True)
rtrn = 1
else:
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
