Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
QueryR
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Julien Lopez
QueryR
Commits
41e330d9
Commit
41e330d9
authored
7 years ago
by
Florian Angerer
Browse files
Options
Downloads
Patches
Plain Diff
Ignore differences in output of 'sessionInfo' and 'extSoftVersion'.
parent
5779b33d
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
mx.fastr/mx_fastr_pkgs.py
+10
-1
10 additions, 1 deletion
mx.fastr/mx_fastr_pkgs.py
with
10 additions
and
1 deletion
mx.fastr/mx_fastr_pkgs.py
+
10
−
1
View file @
41e330d9
...
...
@@ -617,6 +617,10 @@ def _replace_engine_references(output):
output
[
idx
]
=
val
.
replace
(
'
fastr
'
,
'
<engine>
'
).
replace
(
'
gnur
'
,
'
<engine>
'
)
def
_is_ignored_function
(
fun_name
,
gnur_content
,
gnur_stmt
,
fastr_content
,
fastr_stmt
):
return
gnur_stmt
!=
-
1
and
fun_name
in
gnur_content
[
gnur_stmt
]
and
fastr_stmt
!=
-
1
and
fun_name
in
fastr_content
[
fastr_stmt
]
def
_fuzzy_compare
(
gnur_content
,
fastr_content
,
gnur_filename
,
fastr_filename
,
verbose
=
False
):
"""
Compares the test output of GnuR and FastR by ignoring implementation-specific differences like header, error,
...
...
@@ -701,7 +705,12 @@ def _fuzzy_compare(gnur_content, fastr_content, gnur_filename, fastr_filename, v
else
:
# accept differences in the error/warning messages but we need to synchronize
sync
=
True
elif
_is_ignored_function
(
"
sessionInfo
"
,
gnur_content
,
gnur_cur_statement_start
,
fastr_content
,
fastr_cur_statement_start
):
# ignore differences in 'sessionInfo' output
sync
=
True
elif
_is_ignored_function
(
"
extSoftVersion
"
,
gnur_content
,
gnur_cur_statement_start
,
fastr_content
,
fastr_cur_statement_start
):
# ignore differences in 'extSoftVersion' output
sync
=
True
else
:
# genuine difference (modulo whitespace)
if
not
_ignore_whitespace
(
gnur_line
,
fastr_line
):
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment