Changeset: 29ae3722962d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=29ae3722962d
Modified Files:
sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.stable.out
testing/Mfilter.py.in
Branch: Apr2012
Log Message:
Normalize output of test AVG_of_SQRT.SF-2757642 to 1.1.
diffs (31 lines):
diff --git a/sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.stable.out
b/sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.stable.out
--- a/sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.stable.out
+++ b/sql/test/BugTracker-2009/Tests/AVG_of_SQRT.SF-2757642.stable.out
@@ -48,7 +48,7 @@ Ready.
% L1, L2 # name
% char, double # type
% 20, 24 # length
-[ "avg(sqrt(n8)) == 1.1", 1.099999998 ]
+[ "avg(sqrt(n8)) == 1.1", 1.1 ]
# 15:21:14 >
# 15:21:14 > "Done."
diff --git a/testing/Mfilter.py.in b/testing/Mfilter.py.in
--- a/testing/Mfilter.py.in
+++ b/testing/Mfilter.py.in
@@ -93,6 +93,7 @@ norm_in = re.compile('(?:'+')|(?:'.join
# filter for geos 3.3 vs. geos 3.2, can be removed if we have 3.3 everywhere
r"^(ERROR = !ParseException: Expected )('EMPTY' or '\(')( but encountered
: '\)')\n", # 8: 3
# filter for AVG_of_SQRT.SF-2757642: result not always exactly 1.1
+ r'^(\[ "avg\(sqrt\(n8\)\) == 1\.1",\s+)(1\.09999\d*)(\s+\])\n',
# 9: 3
])+')', re.MULTILINE)
norm_hint = '# the original non-normalized output was: '
norm_out = (
@@ -104,6 +105,7 @@ norm_out = (
None, '...', None,
# 6: 3
None, None, '...', None,
# 7: 4
None, "'Z', 'M', 'ZM', 'EMPTY' or '('", None,
# 8: 3
+ None, '1.1', None,
# 9: 3
)
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
