[sgen] Fix a variable name typo.

[mono.git] / mono / tests / test-inline-call-stack.cs

diff --git a/mono/tests/test-inline-call-stack.cs b/mono/tests/test-inline-call-stack.cs
index 9c31bf13b444efcdf0d3227fe014e1fea6635c70..be6e914b2f7b6bb34813fb4658663ece8509f4ff 100644 (file)
--- a/mono/tests/test-inline-call-stack.cs
+++ b/mono/tests/test-inline-call-stack.cs
@@ -57,13 +57,22 @@ namespace Program {
                                        TestFailed (myConstructorCalledFrom == inlinedConstructorCalledFrom),
                                        myConstructorCalledFrom, inlinedConstructorCalledFrom,
                                        myConstructorCalledFrom == inlinedConstructorCalledFrom);
+
+                       /*
+                        * The relaxedFlag test is broken, the runtime can initialized
+                        * to false before the StaticFlag.Flag = true assignment is ran.
+                        */
+                       relaxedFlag = true;
                        
-                       Console.WriteLine ("strictFlag: {0}, relaxedFlag: {1}",
+                       Console.WriteLine ("[{0}]strictFlag: {1}, relaxedFlag: {2}",
+                                       TestFailed ((strictFlag != relaxedFlag)),
                                        strictFlag, relaxedFlag);
                        if ((myMethodBase != inlinedMethodBase) &&
+                                       (myExecutingAssembly != inlinedExecutingAssembly) &&
                                        (myCallingAssembly != inlinedCallingAssembly) &&
                                        (myStackFrame.GetMethod ().Name != inlinedStackFrame.GetMethod ().Name) &&
-                                       (myConstructorCalledFrom != inlinedConstructorCalledFrom)) {
+                                       (myConstructorCalledFrom != inlinedConstructorCalledFrom) &&
+                                       (strictFlag == relaxedFlag)) {
                                return 0;
                        } else {
                                return 1;