Merge branch 'master' of https://gitrepos.estec.esa.int/taste/regression-suites

Demo_Blackbox/DataView.acn

@@ -9,7 +9,7 @@ TASTE-Dataview DEFINITIONS ::= BEGIN
 	/*A few simple types to start with ASN.1*/
 	MyInteger[size 16, encoding pos-int]
 
-	MyReal[encoding IEEE754-1985-64]
+--  	MyReal[encoding IEEE754-1985-64]
 
 	MyEnum[size 2, encoding pos-int]
 

Demo_Blackbox/DataView.asn

@@ -4,7 +4,7 @@ BEGIN
 -- A few simple types to start with ASN.1
 MyInteger   ::= INTEGER (0..255)
 
-MyReal	    ::= REAL (0.0 .. 1000.0)
+--MyReal	    ::= REAL (0.0 .. 1000.0)
 
 MyEnum	    ::= ENUMERATED { hello, world, howareyou }
 

Demo_CVProperties/DataView.asn

@@ -5,7 +5,6 @@ IMPORTS T-Int32, T-UInt32, T-Int8, T-UInt8, T-Boolean FROM TASTE-BasicTypes;
 -- A few simple types to start with ASN.1
 MyInteger   ::= T-UInt8
 
-MyReal	    ::= REAL (0.0 .. 1000.0)
 
 MyEnum	    ::= ENUMERATED { hello, world, howareyou }
 

Demo_Multi_Instances/DataView.asn

@@ -9,7 +9,6 @@ IMPORTS T-Int32, T-UInt32, T-Int8, T-UInt8, T-Boolean FROM TASTE-BasicTypes;
 -- Simple types:
 
 MyInteger   ::= INTEGER (0..255)
-MyReal      ::= REAL (0.0 .. 1000.0)
 MyBool      ::= BOOLEAN
 MyEnum      ::= ENUMERATED { hello, world, how-are-you }
 

Demo_Multi_Instances/DeploymentView.aadl

@@ -79,6 +79,6 @@ PROPERTIES
   Taste::coordinates => "0 0 297000 210000";
   Taste::version => "2.0";
   Taste::interfaceView => "InterfaceView.aadl";
-  Taste::HWLibraries => ("../../../tool-inst/share/ocarina/AADLv2/ocarina_components.aadl");
+  Taste::HWLibraries => ("/home/taste/tool-inst/share/ocarina/AADLv2/ocarina_components.aadl");
 END deploymentview::DV;