Update nfinst tests.

Belonging to [master]: - OpenModelica/OMCompiler#2088 - OpenModelica/OpenModelica-testsuite#808
OpenModelica · Dec 20, 2017 · c513fa3 · c513fa3
1 parent 8225904
commit c513fa3
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 26 deletions.
diff --git a/flattening/modelica/scodeinst/CevalAcos2.mo b/flattening/modelica/scodeinst/CevalAcos2.mo
@@ -1,6 +1,6 @@
 // name: CevalAcos2
 // keywords:
-// status: incorrect
+// status: correct
 // cflags: -d=newInst
 //
 //
@@ -10,11 +10,9 @@ model CevalAcos2
 end CevalAcos2;
 
 // Result:
-// Error processing file: CevalAcos2.mo
+// class CevalAcos2
+//   constant Real r1 = acos(1.3);
+// end CevalAcos2;
 // [flattening/modelica/scodeinst/CevalAcos2.mo:9:3-9:31:writable] Error: Argument 1.3 of acos is out of range (-1 <= x <= 1)
 //
-// # Error encountered! Exiting...
-// # Please check the error message and the flags.
-//
-// Execution failed!
 // endResult
diff --git a/flattening/modelica/scodeinst/CevalLog102.mo b/flattening/modelica/scodeinst/CevalLog102.mo
@@ -1,6 +1,6 @@
 // name: CevalLog102
 // keywords:
-// status: incorrect
+// status: correct
 // cflags: -d=newInst
 //
 //
@@ -10,11 +10,9 @@ model CevalLog102
 end CevalLog102;
 
 // Result:
-// Error processing file: CevalLog102.mo
+// class CevalLog102
+//   constant Real r1 = log10(-1.0);
+// end CevalLog102;
 // [flattening/modelica/scodeinst/CevalLog102.mo:9:3-9:31:writable] Error: Argument -1 of log10 is out of range (x > 0)
 //
-// # Error encountered! Exiting...
-// # Please check the error message and the flags.
-//
-// Execution failed!
 // endResult
diff --git a/flattening/modelica/scodeinst/CevalLog2.mo b/flattening/modelica/scodeinst/CevalLog2.mo
@@ -1,6 +1,6 @@
 // name: CevalLog2
 // keywords:
-// status: incorrect
+// status: correct
 // cflags: -d=newInst
 //
 //
@@ -10,11 +10,9 @@ model CevalLog2
 end CevalLog2;
 
 // Result:
-// Error processing file: CevalLog2.mo
+// class CevalLog2
+//   constant Real r1 = log(-1.0);
+// end CevalLog2;
 // [flattening/modelica/scodeinst/CevalLog2.mo:9:3-9:29:writable] Error: Argument -1 of log is out of range (x > 0)
 //
-// # Error encountered! Exiting...
-// # Please check the error message and the flags.
-//
-// Execution failed!
 // endResult
diff --git a/flattening/modelica/scodeinst/FuncBuiltinOuterProduct.mo b/flattening/modelica/scodeinst/FuncBuiltinOuterProduct.mo
@@ -11,11 +11,17 @@ model FuncBuiltinOuterProduct
 end FuncBuiltinOuterProduct;
 
 // Result:
-// Error processing file: FuncBuiltinOuterProduct.mo
-// Error: Cannot resolve type of expression ' matrix(v1) .* transpose(matrix(v2)) '. The operands have types ' Real[:, 1] .* Real[1, :] ' in component Real[:, 1].
-//
-// # Error encountered! Exiting...
-// # Please check the error message and the flags.
-//
-// Execution failed!
+// class FuncBuiltinOuterProduct
+//   Real x[1,1];
+//   Real x[1,2];
+//   Real x[1,3];
+//   Real x[2,1];
+//   Real x[2,2];
+//   Real x[2,3];
+//   Real x[3,1];
+//   Real x[3,2];
+//   Real x[3,3];
+// equation
+//   x = outerProduct({1.0, 2.0, 3.0}, {4.0, 5.0, 6.0});
+// end FuncBuiltinOuterProduct;
 // endResult
diff --git a/flattening/modelica/scodeinst/Makefile b/flattening/modelica/scodeinst/Makefile
@@ -280,6 +280,7 @@ FuncBuiltinMin.mo \
 FuncBuiltinMod.mo \
 FuncBuiltinNdims.mo \
 FuncBuiltinOnes.mo \
+FuncBuiltinOuterProduct.mo \
 FuncBuiltinPre.mo \
 FuncBuiltinProduct.mo \
 FuncBuiltinRem.mo \
@@ -549,7 +550,6 @@ expconn7.mo \
 func1.mo \
 FuncBuiltinCardinality.mo \
 FuncBuiltinEnumTypeName.mo \
-FuncBuiltinOuterProduct.mo \
 FuncBuiltinReduction.mo \
 function1.mo \
 FunctionRecordArg1.mo \