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

Demo_ABB/DataView.asn

@@ -18,9 +18,9 @@ Floors		::= ENUMERATED {
 -- Types used for the interfacing with the Simulink model
 
 Lift-control ::= SEQUENCE {
-    direction	UpDown,
-    motor	OnOff,
-    brake	OnOff,
+    direction	UpDown DEFAULT down,
+    motor	OnOff  DEFAULT on,
+    brake	OnOff  DEFAULT off,
     door	OpenClose
 }
 
@@ -45,10 +45,9 @@ Cabin-button ::= CHOICE {
 
 Start-condition ::= CHOICE {
 	forever     BOOLEAN,
-	nb-of-cycle INTEGER (1..255)
+	nb-of-cycle INTEGER (50 .. 255)
 }
 
-
 END
 
 

Demo_ExternalLib/contrib/Makefile

@@ -4,7 +4,7 @@ lib/libsomelib.a:	obj/somelib.o
 
 obj/somelib.o:	src/somelib.c
 	mkdir -p obj
-	$(CC) -I headers/ -c -o $@ $<
+	gcc -I headers/ -c -o $@ $<
 
 clean:
 	rm -rf obj lib