Commit bb92976f authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

Removed need to pass TASTE_IV/DV_Properties.aadl

Files are now part of Ocarina library
parent 8248f43e
......@@ -39,7 +39,7 @@ package body TASTE.AADL_Parser is
AADL_Language := Get_String_Name ("aadl");
if Cfg.Interface_View.all'Length = 0 and not Cfg.Check_Data_View then
if Cfg.Interface_View.all'Length = 0 then
-- Use "InterfaceView.aadl" by default, if nothing else is specified
-- and if the tool is not only called to check the data view
Cfg.Interface_View := Default_Interface_View'Access;
......
package TASTE.Parser_Version is
Parser_Release : constant String :=
"5a9ad95 ; Commit Date: Wed Mar 14 14:09:23 2018 ";
"8248f43 ; Commit Date: Wed Mar 14 16:04:45 2018 ";
Ocarina_Version : constant String :=
"Ocarina 2017.x (Working Copy from r957625a)";
"Ocarina 2017.x (Working Copy from r2a52334)";
end TASTE.Parser_Version;
\ No newline at end of file
-- mapping TASTE : AADL
-- Node : System
-- Processor : Processor
-- Process : Function
-- Bus : Bus
-- Device : Device
-- Driver : Driver
property set TASTE_DV_Properties is
-- MyBoolean: aadlboolean applies to (System, Processor, Process);
CoverageEnabled: aadlboolean applies to (Process);
Comment: aadlstring applies to (Device, Bus);
-- MyInt: aadlinteger applies to (System);
-- MyReal: aadlreal applies to (Bus);
-- MyEnum: enumeration (val1, val2, val3, val4) applies to (Device);
end TASTE_DV_Properties;
-- mapping TASTE : AADL
-- Container : Package
-- Function : System
-- Interface : Subprogram
property set TASTE_IV_Properties is
-- MyBoolean: aadlboolean applies to (System, Package);
-- MyString: aadlstring applies to (System, Subprogram);
Version: aadlstring applies to (System);
is_Component_Type : aadlboolean applies to (System);
is_instance_of : aadlstring applies to (System);
-- MyInt: aadlinteger applies to (System);
-- MyReal: aadlreal applies to (System);
-- MyEnum: enumeration (val1, val2, val3, val4) applies to (System);
MSCFiles : aadlstring applies to (Subprogram);
end TASTE_IV_Properties;
......@@ -7,7 +7,6 @@ test-parse:
-c deploymentview.aadl \
-d dataview.aadl \
../common/ocarina_components.aadl \
../common/TASTE_DV_Properties.aadl \
2>&1 | tail -2 | diff expected -
clean:
......
......@@ -10,9 +10,7 @@ test-parse: clean
-i InterfaceView.aadl \
-c DeploymentView.aadl \
-d DataView.aadl \
../common/TASTE_IV_Properties.aadl \
../common/ocarina_components.aadl \
../common/TASTE_DV_Properties.aadl
clean:
rm -rf output
......
......@@ -3,7 +3,7 @@ all: test-parse
test-parse: clean
$(AADL_PARSER) -o output -i InterfaceView.aadl -d DataView.aadl ../common/TASTE_IV_Properties.aadl
$(AADL_PARSER) -o output -i InterfaceView.aadl -d DataView.aadl
clean:
......
......@@ -8,9 +8,8 @@ test-parse:
-i InterfaceView.aadl \
-c DeploymentView.aadl \
-d DataView.aadl \
../common/TASTE_IV_Properties.aadl \
ocarina_components.aadl \
../common/TASTE_DV_Properties.aadl 2>&1 | tail -1 | diff expected -
2>&1 | tail -1 | diff expected -
clean:
rm -rf obj $(exec) *~
......
......@@ -8,9 +8,8 @@ test-parse:
-i InterfaceView.aadl \
-c DeploymentView.aadl \
-d DataView.aadl \
../common/TASTE_IV_Properties.aadl \
ocarina_components.aadl \
../common/TASTE_DV_Properties.aadl 2>&1 | tail -1 | diff expected -
2>&1 | tail -1 | diff expected -
clean:
rm -rf obj $(exec) *~
......
......@@ -6,7 +6,6 @@ test-parse:
$(AADL_PARSER) --gw \
--debug \
-o output \
../common/TASTE_IV_Properties.aadl
# 2>&1 | tail -1 | diff expected -
clean:
......
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