Changeset: dd777c76a3f9 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dd777c76a3f9 Modified Files: geom/BugTracker/Tests/X_crash.SF-1971632.dbinit5 geom/BugTracker/Tests/copy_into_crash.SF-1975402.dbinit5 geom/BugTracker/Tests/geom.dbinit5 geom/src/sql/Tests/basic.dbinit5 geom/src/sql/Tests/example.dbinit5 geom/src/sql/Tests/geom.dbinit5 geom/src/sql/Tests/geom_curve.dbinit5 geom/src/sql/Tests/geom_geometry.dbinit5 geom/src/sql/Tests/geom_linestring.dbinit5 geom/src/sql/Tests/geom_mbr.dbinit5 geom/src/sql/Tests/geom_multi.dbinit5 geom/src/sql/Tests/geom_point.dbinit5 geom/src/sql/Tests/geom_polygon.dbinit5 geom/src/sql/Tests/geom_surface.dbinit5 geom/src/sql/Tests/relation.dbinit5 geom/src/sql/Tests/spatial.dbinit5 Branch: default Log Message:
merge from Jun2010: remove explicit "include geom" as this is now automatic diffs (98 lines): diff -r 9aa607a857f8 -r dd777c76a3f9 geom/BugTracker/Tests/X_crash.SF-1971632.dbinit5 --- a/geom/BugTracker/Tests/X_crash.SF-1971632.dbinit5 Fri May 07 21:10:33 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -include geom; diff -r 9aa607a857f8 -r dd777c76a3f9 geom/BugTracker/Tests/copy_into_crash.SF-1975402.dbinit5 --- a/geom/BugTracker/Tests/copy_into_crash.SF-1975402.dbinit5 Fri May 07 21:10:33 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -include geom; diff -r 9aa607a857f8 -r dd777c76a3f9 geom/BugTracker/Tests/geom.dbinit5 --- a/geom/BugTracker/Tests/geom.dbinit5 Fri May 07 21:10:33 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -include geom; diff -r 9aa607a857f8 -r dd777c76a3f9 geom/src/sql/Tests/basic.dbinit5 --- a/geom/src/sql/Tests/basic.dbinit5 Fri May 07 21:10:33 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -include geom; diff -r 9aa607a857f8 -r dd777c76a3f9 geom/src/sql/Tests/example.dbinit5 --- a/geom/src/sql/Tests/example.dbinit5 Fri May 07 21:10:33 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -include geom; diff -r 9aa607a857f8 -r dd777c76a3f9 geom/src/sql/Tests/geom.dbinit5 --- a/geom/src/sql/Tests/geom.dbinit5 Fri May 07 21:10:33 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -include geom; diff -r 9aa607a857f8 -r dd777c76a3f9 geom/src/sql/Tests/geom_curve.dbinit5 --- a/geom/src/sql/Tests/geom_curve.dbinit5 Fri May 07 21:10:33 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -include geom; diff -r 9aa607a857f8 -r dd777c76a3f9 geom/src/sql/Tests/geom_geometry.dbinit5 --- a/geom/src/sql/Tests/geom_geometry.dbinit5 Fri May 07 21:10:33 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -include geom; diff -r 9aa607a857f8 -r dd777c76a3f9 geom/src/sql/Tests/geom_linestring.dbinit5 --- a/geom/src/sql/Tests/geom_linestring.dbinit5 Fri May 07 21:10:33 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -include geom; diff -r 9aa607a857f8 -r dd777c76a3f9 geom/src/sql/Tests/geom_mbr.dbinit5 --- a/geom/src/sql/Tests/geom_mbr.dbinit5 Fri May 07 21:10:33 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -include geom; diff -r 9aa607a857f8 -r dd777c76a3f9 geom/src/sql/Tests/geom_multi.dbinit5 --- a/geom/src/sql/Tests/geom_multi.dbinit5 Fri May 07 21:10:33 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -include geom; diff -r 9aa607a857f8 -r dd777c76a3f9 geom/src/sql/Tests/geom_point.dbinit5 --- a/geom/src/sql/Tests/geom_point.dbinit5 Fri May 07 21:10:33 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -include geom; diff -r 9aa607a857f8 -r dd777c76a3f9 geom/src/sql/Tests/geom_polygon.dbinit5 --- a/geom/src/sql/Tests/geom_polygon.dbinit5 Fri May 07 21:10:33 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -include geom; diff -r 9aa607a857f8 -r dd777c76a3f9 geom/src/sql/Tests/geom_surface.dbinit5 --- a/geom/src/sql/Tests/geom_surface.dbinit5 Fri May 07 21:10:33 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -include geom; diff -r 9aa607a857f8 -r dd777c76a3f9 geom/src/sql/Tests/relation.dbinit5 --- a/geom/src/sql/Tests/relation.dbinit5 Fri May 07 21:10:33 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -include geom; diff -r 9aa607a857f8 -r dd777c76a3f9 geom/src/sql/Tests/spatial.dbinit5 --- a/geom/src/sql/Tests/spatial.dbinit5 Fri May 07 21:10:33 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -include geom; diff -r 9aa607a857f8 -r dd777c76a3f9 testing/src/Mtest.py.in --- a/testing/src/Mtest.py.in Fri May 07 21:10:33 2010 +0200 +++ b/testing/src/Mtest.py.in Sat May 08 09:16:12 2010 +0200 @@ -3729,12 +3729,10 @@ if MissingMods: ErrXit('Stopping Geom testing as modules "%s" are missing!' % str(MissingMods)) mod_name = 'geom' - if par['M5']: - mod_load = 'include %s;' % mod_name if par['M4']: mod_load = 'module(%s);' % mod_name - if Check('%s --dbname=%s "--dbinit=%s"' % (env['exe']['Mserver'][1], TSTPREF, mod_load), QUIT): - ErrXit('Stopping Geom testing as module "%s" fails to load!' % mod_name) + if Check('%s --dbname=%s "--dbinit=%s"' % (env['exe']['Mserver'][1], TSTPREF, mod_load), QUIT): + ErrXit('Stopping Geom testing as module "%s" fails to load!' % mod_name) if par['PACKAGE'][:8] == 'monetdb-' and par['PACKAGE'][8:] in ('sql','geom'): if not env['exe']['SQL_Client'][0]: _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list