Update nfinst tests.

Belonging to [master]:
  - OpenModelica/OMCompiler#2293
  - #885

flattening/modelica/scodeinst/ClassExtends8.mo

@@ -0,0 +1,36 @@
+// name: ClassExtends8
+// keywords:
+// status: correct
+// cflags: -d=newInst
+//
+
+package P1
+  replaceable model M
+    Real x;
+  end M;
+end P1;
+
+package P2
+  extends P1;
+
+  redeclare model extends M
+    Real y;
+  end M;
+end P2;
+
+model ClassExtends8
+  package PA = P2;
+  package PB = P2;
+
+  PA.M m1;
+  PB.M m2;
+end ClassExtends8;
+
+// Result:
+// class ClassExtends8
+//   Real m1.x;
+//   Real m1.y;
+//   Real m2.x;
+//   Real m2.y;
+// end ClassExtends8;
+// endResult

flattening/modelica/scodeinst/Makefile

@@ -96,6 +96,7 @@ ClassExtends4.mo \
 ClassExtends5.mo \
 ClassExtends6.mo \
 ClassExtends7.mo \
+ClassExtends8.mo \
 ClassExtendsBuiltin1.mo \
 ClassExtendsBuiltin2.mo \
 ClassExtendsBuiltin3.mo \
@@ -504,6 +505,7 @@ RangeTypeError1.mo \
 RangeTypeError2.mo \
 RangeTypeError3.mo \
 RecursiveExtends1.mo \
+RecursiveExtends3.mo \
 RedeclareClass1.mo \
 RedeclareClassComponent.mo \
 RedeclareComponentClass.mo \

flattening/modelica/scodeinst/RecursiveExtends3.mo

@@ -0,0 +1,26 @@
+// name: RecursiveExtends3
+// keywords:
+// status: incorrect
+// cflags: -d=newInst
+//
+// Checks that the compiler catches recursive extends.
+//
+
+model A
+  Real x;
+end A;
+
+model RecursiveExtends3
+  model A = A;
+  A a;
+end RecursiveExtends3;
+
+// Result:
+// Error processing file: RecursiveExtends3.mo
+// [flattening/modelica/scodeinst/RecursiveExtends3.mo:14:3-14:14:writable] Error: Recursive short class definition of A in terms of A.
+//
+// # Error encountered! Exiting...
+// # Please check the error message and the flags.
+//
+// Execution failed!
+// endResult