Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
OpenGEODE
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
TASTE
OpenGEODE
Commits
2bdcedbb
Commit
2bdcedbb
authored
Sep 18, 2018
by
Daniel Tuulik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use expected_c for diff if it is found with C simulation test
parent
8fbcce16
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
5 deletions
+8
-5
tests/regression/testqgen.py
tests/regression/testqgen.py
+8
-5
No files found.
tests/regression/testqgen.py
View file @
2bdcedbb
...
...
@@ -139,7 +139,7 @@ def run_test(op):
return
(
errcode
,
stdout
,
stderr
,
op
.
root_model
,
op
.
rule
)
def
_run_gprbuild
(
gprfile
,
exec_file
):
def
_run_gprbuild
(
gprfile
,
exec_file
,
lang
):
args
=
[
"gprbuild"
,
"-p"
,
# Create obj dirs
"-j1"
,
# when tests run in parallel, CPUs are already
...
...
@@ -165,8 +165,11 @@ def _run_gprbuild(gprfile, exec_file):
if
errcode
!=
0
:
return
(
errcode
,
stdout
,
stderr
)
if
os
.
path
.
isfile
(
"expected"
):
errcode
=
os
.
system
(
"diff expected actual"
)
if
lang
==
"c"
and
os
.
path
.
isfile
(
"expected_c"
):
errcode
=
os
.
system
(
"diff expected_c actual"
)
else
:
if
os
.
path
.
isfile
(
"expected"
):
errcode
=
os
.
system
(
"diff expected actual"
)
return
(
errcode
,
stdout
,
stderr
)
...
...
@@ -270,9 +273,9 @@ end Prj_C;""")
f
.
write
(
c_prj
)
if
do_ada
:
return
_run_gprbuild
(
gpr_filename_ada
,
ada_exe_path
)
return
_run_gprbuild
(
gpr_filename_ada
,
ada_exe_path
,
lang
)
if
do_c
:
return
_run_gprbuild
(
gpr_filename_c
,
c_exe_path
)
return
_run_gprbuild
(
gpr_filename_c
,
c_exe_path
,
lang
)
if
__name__
==
'__main__'
:
ret
=
main
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment