Commit 2fb09fe6 authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

Fix test1 results

test1 is using an interface view from TASTE v1 (with old _obj suffices,
and not containing the TASTE::InterfaceName property). the test detects
and rejects it.
parent aa11c4c5
......@@ -422,6 +422,15 @@ package body Parser_Utils is
(Get_Referenced_Entity (AIN.Destination (Conn)));
begin
-- Put_Line (AIN.Node_Kind'Image (Kind (Caller)));
-- If RI_Name has no value it means the interface view misses the
-- AADL property "TASTE::InterfaceName". Not supported.
Exit_On_Error (RI_Name = No_Name,
"[ERROR] Interface view contains errors "
& "(Missing TASTE::InterfaceName properties)"
& ASCII.CR & ASCII.LF
& " Try updating it with taste-edit-project");
-- Filter out connections if the PI is cyclic (not a connection!)
if Get_RCM_Operation_Kind
(Get_Referenced_Entity (AIN.Destination (Conn))) = Cyclic_Operation
......@@ -429,6 +438,10 @@ package body Parser_Utils is
return Nothing;
end if;
if RI_Name = No_Name then
return Nothing;
end if;
PI_Name := Get_Interface_Name
(Get_Referenced_Entity (AIN.Source (Conn)));
......
package Parser_Version is
Parser_Release : constant String :=
"e5c29d4 ; Commit Date: Tue Jul 18 10:06:32 2017 ";
"aa11c4c ; Commit Date: Tue Jul 18 10:43:12 2017 ";
Ocarina_Version : constant String :=
"Ocarina 2017.x (Working Copy from r0338d89)";
end Parser_Version;
\ No newline at end of file
......@@ -3,7 +3,7 @@ AADL_PARSER=../../aadl_parser
all: test-parse
test-parse:
$(AADL_PARSER) -glue -i interfaceview.aadl -c deploymentview.aadl -d dataview.aadl ../common/ocarina_components.aadl ../common/TASTE_DV_Properties.aadl
$(AADL_PARSER) -glue -i interfaceview.aadl -c deploymentview.aadl -d dataview.aadl ../common/ocarina_components.aadl ../common/TASTE_DV_Properties.aadl 2>&1 | tail -2 | diff expected -
clean:
rm -rf obj $(exec) *~
......
[ERROR] Interface view contains errors (Missing TASTE::InterfaceName properties)
Try updating it with taste-edit-project
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment