Author: mvidner Date: Thu May 26 18:06:37 2011 New Revision: 64122 URL: http://svn.opensuse.org/viewcvs/yast?rev=64122&view=rev Log: report an error from the ycp perspective, not c++ (avoid spurious test run differences) Modified: trunk/core/libycp/src/YExpression.cc trunk/core/libycp/testsuite/tests/statements/deep_recursion.err Modified: trunk/core/libycp/src/YExpression.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YExpression.cc?rev=64122&r1=64121&r2=64122&view=diff ============================================================================== --- trunk/core/libycp/src/YExpression.cc (original) +++ trunk/core/libycp/src/YExpression.cc Thu May 26 18:06:37 2011 @@ -3117,7 +3117,7 @@ if (ee.endlessRecursion ()) { - y2error ("Returning nil instead of calling the function."); + ycp2error ("Returning nil instead of calling the function."); return YCPVoid (); } Modified: trunk/core/libycp/testsuite/tests/statements/deep_recursion.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/testsuite/tests/statements/deep_recursion.err?rev=64122&r1=64121&r2=64122&view=diff ============================================================================== --- trunk/core/libycp/testsuite/tests/statements/deep_recursion.err (original) +++ trunk/core/libycp/testsuite/tests/statements/deep_recursion.err Thu May 26 18:06:37 2011 @@ -14,7 +14,7 @@ } ---------------------------------------------------------------------- [libycp] ExecutionEnvironment.cc(endlessRecursion):96 Recursion limit of 1001 call frames reached. Set the environment variable Y2RECURSIONLIMIT to change this -[libycp] YExpression.cc(evaluate):3120 Returning nil instead of calling the function. +[Interpreter] tests/statements/deep_recursion.ycp:5 Returning nil instead of calling the function. [Interpreter] tests/statements/deep_recursion.ycp:5 Argument (Multiply ((a - 1), b)) to +(...) evaluates to nil [Interpreter] tests/statements/deep_recursion.ycp:5 Argument (Multiply ((a - 1), b)) to +(...) evaluates to nil [Interpreter] tests/statements/deep_recursion.ycp:5 Argument (Multiply ((a - 1), b)) to +(...) evaluates to nil -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org